ApplicationDefinition.st
changeset 23451 919b0ee3c96e
parent 23447 56d9f9b89345
child 23460 b246dde491c8
--- a/ApplicationDefinition.st	Mon Oct 15 01:31:22 2018 +0200
+++ b/ApplicationDefinition.st	Mon Oct 15 01:38:03 2018 +0200
@@ -2847,7 +2847,7 @@
      This is used to generate a macOS deployable dmg containing an app"
 
     |genLine product productFile dmgVolume dmgDir appDir contentsDir macOSDir 
-     resourcesDir dirsMade|
+     resourcesDir packagesDir dirsMade|
 
     product := self productName.
     productFile := self productFilename.
@@ -2858,6 +2858,7 @@
     contentsDir := appDir,'/Contents'.
     macOSDir := contentsDir,'/MacOS'.
     resourcesDir := contentsDir,'/Resources'.
+    packagesDir := contentsDir,'/Packages'.
     dirsMade := Set new.
 
     genLine :=
@@ -2894,8 +2895,10 @@
         s tab; nextPutLine:('@-mkdir "%1"' bindWith:macOSDir).  dirsMade add:macOSDir.
         "/ this is done indirectly, by additionalFilesToInstall_XXX
         "/ s tab; nextPutLine:('@-mkdir "%1"/packages' bindWith:macOSDir).  dirsMade add:(macOSDir,'/packages').
-        s tab; nextPutLine:('@-mkdir "%1"' bindWith:resourcesDir).  dirsMade add:resourcesDir.
-        s tab; nextPutLine:('@$(MAKE) RESOURCEFILES RESOURCES="%1"' bindWith:resourcesDir).
+        "/ s tab; nextPutLine:('@-mkdir "%1"' bindWith:resourcesDir).  dirsMade add:resourcesDir.
+        "/ s tab; nextPutLine:('@$(MAKE) RESOURCEFILES RESOURCES="%1"' bindWith:resourcesDir).
+        s tab; nextPutLine:('@-mkdir "%1"' bindWith:packagesDir).  dirsMade add:packagesDir.
+        s tab; nextPutLine:('@$(MAKE) RESOURCEFILES RESOURCES="%1"' bindWith:packagesDir).
         s tab; nextPutLine:('cp "',self applicationName,'" "',macOSDir,'/"').
         s tab; nextPutLine:('@-cp osx/Info.plist "',contentsDir,'/"').
         self osxDmgBackgroundImageFile notNil ifTrue:[