@@ -68,7 +68,7 @@ makeMacMetaPkg opts tmpdir pkgDesc = do (packageOutputFile opts) contentsDir <- makeAndCanonicalize $ tmpdir </> "Stage" - packagesDir <- makeAndCanonicalize $ tmpdir </> "Packages" + let packagesDir = outputPackagePath let subOptions = opts { packageOutputDir = Just packagesDir , packageOutputFile = Nothing } @@ -89,27 +89,28 @@ makeMacMetaPkg opts tmpdir pkgDesc = do return (takeFileName `map` files)) (extraPkgDir opts) + return () - let allPackages = extraPackages ++ packageFileNames + -- let allPackages = extraPackages ++ packageFileNames - -- FIXME: sizes bogus - sizes <- mapM (unXarToStaging packagesDir contentsDir) allPackages + -- -- FIXME: sizes bogus + -- sizes <- mapM (unXarToStaging packagesDir contentsDir) allPackages - -- write any Resources/ files (likely none), dump out - -- "Distribution" file, and xar up the results + -- -- write any Resources/ files (likely none), dump out + -- -- "Distribution" file, and xar up the results - -- FIXME: Resources/ (for background images) + -- -- FIXME: Resources/ (for background images) - writeInstallerScript (contentsDir </> "Distribution") $ - installerScript pkgTitle - Nothing -- FIXME: populate these - Nothing - (Just pkgDescription) - Nothing - Nothing - (allPackages `zip` sizes) + -- writeInstallerScript (contentsDir </> "Distribution") $ + -- installerScript pkgTitle + -- Nothing -- FIXME: populate these + -- Nothing + -- (Just pkgDescription) + -- Nothing + -- Nothing + -- (allPackages `zip` sizes) - xarUpResults contentsDir outputPackagePath + -- xarUpResults contentsDir outputPackagePath where -------------------------------------------------------------------- Program/MakeMetaPackage.hs @@ -1,5 +1,5 @@ name: cabal2macpkg -version: 0.2 +version: 0.3 homepage: http://gregorycollins.net/ synopsis: Create OSX installation packages from Cabal packages description: Create OSX installation packages from Cabal packages cabal2macpkg.cabal 5cc4579ef6f30f8fbd38c22bc9a1fb93e3fe6b9a Gregory Collins greg@gregorycollins.net http://github.com/gregorycollins/cabal2macpkg/commit/527934abadc2951707356a2e149526e5af672318 527934abadc2951707356a2e149526e5af672318 2009-07-24T17:42:49-07:00 2009-07-24T17:42:49-07:00 For metapackages, just dump out the .pkg files into a folder instead of fruitlessly trying to build a broken installer 6a55a47da7bc2f7deb5a6fbbf842f9e017f26223 Gregory Collins greg@gregorycollins.net