Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

For metapackages, just dump out the .pkg files into a folder instead …

…of fruitlessly trying to build a broken installer
  • Loading branch information...
commit 527934abadc2951707356a2e149526e5af672318 1 parent 5cc4579
Gregory Collins authored
33  Program/MakeMetaPackage.hs
@@ -68,7 +68,7 @@ makeMacMetaPkg opts tmpdir pkgDesc = do
68 68
                                    (packageOutputFile opts)
69 69
 
70 70
     contentsDir       <- makeAndCanonicalize $ tmpdir </> "Stage"
71  
-    packagesDir       <- makeAndCanonicalize $ tmpdir </> "Packages"
  71
+    let packagesDir   =  outputPackagePath
72 72
 
73 73
     let subOptions = opts { packageOutputDir  = Just packagesDir
74 74
                           , packageOutputFile = Nothing }
@@ -89,27 +89,28 @@ makeMacMetaPkg opts tmpdir pkgDesc = do
89 89
                  return (takeFileName `map` files))
90 90
               (extraPkgDir opts)
91 91
 
  92
+    return ()
92 93
 
93  
-    let allPackages = extraPackages ++ packageFileNames
  94
+    -- let allPackages = extraPackages ++ packageFileNames
94 95
 
95  
-    -- FIXME: sizes bogus
96  
-    sizes <- mapM (unXarToStaging packagesDir contentsDir) allPackages
  96
+    -- -- FIXME: sizes bogus
  97
+    -- sizes <- mapM (unXarToStaging packagesDir contentsDir) allPackages
97 98
 
98  
-    -- write any Resources/ files (likely none), dump out
99  
-    -- "Distribution" file, and xar up the results
  99
+    -- -- write any Resources/ files (likely none), dump out
  100
+    -- -- "Distribution" file, and xar up the results
100 101
 
101  
-    -- FIXME: Resources/ (for background images)
  102
+    -- -- FIXME: Resources/ (for background images)
102 103
 
103  
-    writeInstallerScript (contentsDir </> "Distribution") $
104  
-      installerScript pkgTitle
105  
-                      Nothing   -- FIXME: populate these
106  
-                      Nothing
107  
-                      (Just pkgDescription)
108  
-                      Nothing
109  
-                      Nothing
110  
-                      (allPackages `zip` sizes)
  104
+    -- writeInstallerScript (contentsDir </> "Distribution") $
  105
+    --   installerScript pkgTitle
  106
+    --                   Nothing   -- FIXME: populate these
  107
+    --                   Nothing
  108
+    --                   (Just pkgDescription)
  109
+    --                   Nothing
  110
+    --                   Nothing
  111
+    --                   (allPackages `zip` sizes)
111 112
 
112  
-    xarUpResults contentsDir outputPackagePath
  113
+    -- xarUpResults contentsDir outputPackagePath
113 114
 
114 115
   where
115 116
     --------------------------------------------------------------------
2  cabal2macpkg.cabal
... ...
@@ -1,5 +1,5 @@
1 1
 name:               cabal2macpkg
2  
-version:            0.2
  2
+version:            0.3
3 3
 homepage:           http://gregorycollins.net/
4 4
 synopsis:           Create OSX installation packages from Cabal packages
5 5
 description:        Create OSX installation packages from Cabal packages

0 notes on commit 527934a

Please sign in to comment.
Something went wrong with that request. Please try again.