diff --git a/GNUmakefile b/GNUmakefile index 98661eb..fe68c14 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -15,30 +15,24 @@ all: patch133 # 1.26b to 1.28 patch128: COMMONJ=common-1.28.j patch128: PATCH_LVL=128 -patch128: clean configure-old-patch build +patch128: CABAL_FLAGS=-f old-patch +patch128: clean build patch133: COMMONJ=common-1.33.j patch133: PATCH_LVL=133 -patch133: clean configure-new-patch build - -configure-old-patch: - rm -f cabal.project.local - ln -s cabal.project.local.128 cabal.project.local - -configure-new-patch: - rm -f cabal.project.local - ln -s cabal.project.local.133 cabal.project.local +patch133: CABAL_FLAGS= +patch133: clean build build: $(PROCESSED) Hot/Types.hs Hot/CommonJHash.hs - cabal build jhcr + cabal build $(CABAL_FLAGS) jhcr jhcr.exe: build rm -f $@ - strip $$(cabal list-bin jhcr) - upx -qq $$(cabal list-bin jhcr) -o $@ + strip $$(cabal list-bin $(CABAL_FLAGS) jhcr) + upx -qq $$(cabal list-bin $(CABAL_FLAGS) jhcr) -o $@ runtime/convert.j Hot/Types.hs Hot/CommonJHash.hs runtime/types.j runtime/g-type-bin.j: $(COMMONJ) - cabal run convert -- $(COMMONJ) + cabal run $(CABAL_FLAGS) convert -- $(COMMONJ) process: $(PROCESSED) diff --git a/Main.hs b/Main.hs index cfb7e4d..199e990 100644 --- a/Main.hs +++ b/Main.hs @@ -297,7 +297,8 @@ updateX o = do # if OLD_PATCH withBinaryFile (preloadPath o "JHCR.txt") WriteMode $ \f -> hPutBuilder f $ J.pretty preload -#else -- technically this only needs to be done on patch 1.33 or higher +#else +-- technically this only needs to be done on patch 1.33 or higher withBinaryFile (preloadPath o "JHCR-" <> show seq <> ".txt") WriteMode $ \f -> hPutBuilder f $ J.pretty preload #endif diff --git a/cabal.project.local.128 b/cabal.project.local.128 deleted file mode 100644 index 7517dd7..0000000 --- a/cabal.project.local.128 +++ /dev/null @@ -1,3 +0,0 @@ -ignore-project: False -flags: +old-patch - diff --git a/cabal.project.local.133 b/cabal.project.local.133 deleted file mode 100644 index 6dbf7fa..0000000 --- a/cabal.project.local.133 +++ /dev/null @@ -1,2 +0,0 @@ -ignore-project: False -flags: -old-patch