small changes

Author: gbaz

hptool/src/OS/Mac.hs

@@ -138,8 +138,10 @@ macOsFromConfig BuildConfig{..} = OS{..}
                 , out
                 ]
 
+
         hpPkgFile %> \out -> do
-            need [targetDir, dir extrasDir]  -- FIXME(mzero): could be more specific
+            need [targetDir]
+            need [dir extrasDir]  -- FIXME(mzero): could be more specific
             command_ []
                 "pkgbuild"
                 [ "--identifier", "org.haskell.HaskellPlatform.Libraries."

hptool/src/Package.hs

@@ -64,6 +64,7 @@ packageRules = do
             -- Having the package names reverse sort as graph keys makes the SCC
             -- components come out closer to normal sort order. Go figure!
 
+--TODO choose proper "allPackages" based on minimal or full build
 
 installAction :: FilePath -> Bool -> Release -> Action ()
 installAction depFile incExtras hpRel = do

hptool/src/Releases2016.hs

@@ -106,6 +106,7 @@ hp_8_0_1 =
         , incLib "fixed"                    "0.2.1.1"
         ]
 
+
 hp_8_0_2 :: Release
 hp_8_0_2 =
     releaseWithMinimal "8.0.2"

platform.sh

@@ -1,32 +1,36 @@
 #!/bin/sh
 
+
+#for OS X in particular
+export MACOSX_DEPLOYMENT_TARGET=10.6
+
 set -e
 
-HPTOOL=hptool/dist/build/hptool/hptool
+HPTOOL=hptool/dist-newstyle/build/hptool-0.1/build/hptool/hptool
 HPTOOL_ALT=hptool/.cabal-sandbox/bin/hptool
 
-if ( cabal sandbox --help >/dev/null 2>&1 ) ; then
-    if [ \! -d hptool/.cabal-sandbox ]
-    then
-        echo '***'
-        echo '*** Setting up sandbox for hptool'
-        echo '***'
-        cabal update
-        (cd hptool; cabal sandbox init; cabal install --only-dependencies)
-    fi
-else
-    if ( cabal install --dry-run --only-dependencies | grep -q 'would be installed' ) ; then
-        echo '=== pre-requisite packages for hptool are not installed'
-        echo '    run the following:'
-        echo '    cd hptool ; cabal install --only-dependencies'
-        exit 1
-    fi
-fi
+#if ( cabal sandbox --help >/dev/null 2>&1 ) ; then
+#    if [ \! -d hptool/.cabal-sandbox ]
+#    then
+#        echo '***'
+#        echo '*** Setting up sandbox for hptool'
+#        echo '***'
+#        cabal update
+#        (cd hptool; cabal sandbox init; cabal install --only-dependencies)
+#    fi
+#else
+#    if ( cabal install --dry-run --only-dependencies | grep -q 'would be installed' ) ; then
+#        echo '=== pre-requisite packages for hptool are not installed'
+#        echo '    run the following:'
+#        echo '    cd hptool ; cabal install --only-dependencies'
+#        exit 1
+#    fi
+#fi
 
 echo '***'
 echo '*** Building hptool'
 echo '***'
-(cd hptool; cabal build)
+(cd hptool; cabal new-build)
 
 if [ "$HPTOOL_ALT" -nt "$HPTOOL" ] ; then
     HPTOOL="$HPTOOL_ALT"