Skip to content
Snippets Groups Projects
Unverified Commit f410478d authored by Rodrigo Mesquita's avatar Rodrigo Mesquita :seedling:
Browse files

Ammend various migrations with new static ()

parent 323b72c9
No related branches found
No related tags found
1 merge request!23Wip/romes/migration v2 + v3
......@@ -2,7 +2,7 @@ diff --git a/Setup.hs b/SetupHooks.hs
similarity index 79%
rename from Setup.hs
rename to SetupHooks.hs
index 2088620..4962ed5 100644
index 2088620..19796da 100644
--- a/Setup.hs
+++ b/SetupHooks.hs
@@ -5,49 +5,51 @@
......@@ -144,7 +144,7 @@ index 2088620..4962ed5 100644
+ noSetupHooks
+ { buildHooks =
+ noBuildHooks
+ { preBuildComponentRules = Just $ rules (static mkPkgInfoModules)
+ { preBuildComponentRules = Just $ rules (static ()) mkPkgInfoModules
+ }
}
......
......@@ -116,7 +116,7 @@ index f2d1733..0000000
-stripPrefix _ _ = Nothing
diff --git a/SetupHooks.hs b/SetupHooks.hs
new file mode 100644
index 0000000..945dbb2
index 0000000..f783b22
--- /dev/null
+++ b/SetupHooks.hs
@@ -0,0 +1,111 @@
......@@ -155,7 +155,7 @@ index 0000000..945dbb2
+setupHooks =
+ noSetupHooks
+ { buildHooks = noBuildHooks
+ { preBuildComponentRules = Just $ rules (static buildRules) }
+ { preBuildComponentRules = Just $ rules (static ()) buildRules }
+ }
+
+buildRules :: PreBuildComponentInputs -> RulesM ()
......
......@@ -144,7 +144,7 @@ index c968978..0000000
- condTree' = condTree { condTreeData = testSuite' }
diff --git a/SetupHooks.hs b/SetupHooks.hs
new file mode 100644
index 0000000..016435a
index 0000000..fe3a84a
--- /dev/null
+++ b/SetupHooks.hs
@@ -0,0 +1,108 @@
......@@ -173,7 +173,7 @@ index 0000000..016435a
+ noSetupHooks
+ { buildHooks =
+ noBuildHooks
+ { preBuildComponentRules = Just $ rules $ static
+ { preBuildComponentRules = Just $ rules (static ()) $
+ (\PreBuildComponentInputs{buildingWhat=flags, localBuildInfo=lbi, targetInfo=tgt} ->
+ case targetComponent tgt of
+ CTest suite
......
......@@ -82,7 +82,7 @@ index f5e64fd..0000000
-testDeps xs ys = map fst $ nub $ componentPackageDeps xs ++ componentPackageDeps ys
diff --git a/SetupHooks.hs b/SetupHooks.hs
new file mode 100644
index 0000000..bad5584
index 0000000..cfd0445
--- /dev/null
+++ b/SetupHooks.hs
@@ -0,0 +1,119 @@
......@@ -131,7 +131,7 @@ index 0000000..bad5584
+ { -- autogen-modules already registers Build_...
+ buildHooks =
+ noBuildHooks
+ { preBuildComponentRules = Just $ (rules (static preBuildHook)) }
+ { preBuildComponentRules = Just $ (rules (static ()) preBuildHook) }
+ }
+
+preBuildHook :: PreBuildComponentInputs -> RulesM ()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment