ApplicationDefinition.st
changeset 23466 702c6d257ea2
parent 23465 ec95b496db76
child 23469 6d008d50351e
--- a/ApplicationDefinition.st	Wed Oct 24 21:24:00 2018 +0200
+++ b/ApplicationDefinition.st	Thu Oct 25 02:18:15 2018 +0200
@@ -2869,17 +2869,19 @@
             |sourcePattern relPath destination|
 
             sourcePattern := srcAndDest first.
-            relPath := srcAndDest second.
-            (relPath startsWith:'bin') ifTrue:[
-                relPath := '.',(relPath copyFrom:4)
-            ].
-            destination := contentsDir,'/',dstDir,'/',relPath.
-            (dirsMade includes:destination) ifFalse:[
-                stream tab; nextPutLine:('@-mkdir "%1"' bindWith:destination).
-                dirsMade add:destination.
-            ].
-            sourcePattern notNil ifTrue:[
-                stream tab; nextPutLine:('-cp -r %1 "%2"' bindWith:sourcePattern with:destination).
+            sourcePattern = 'resources' ifFalse:[
+                relPath := srcAndDest second.
+                (relPath startsWith:'bin') ifTrue:[
+                    relPath := '.',(relPath copyFrom:4)
+                ].
+                destination := contentsDir,'/',dstDir,'/',relPath.
+                (dirsMade includes:destination) ifFalse:[
+                    stream tab; nextPutLine:('@-mkdir -p "%1"' bindWith:destination).
+                    dirsMade add:destination.
+                ].
+                sourcePattern notNil ifTrue:[
+                    stream tab; nextPutLine:('-cp -r %1 "%2"' bindWith:sourcePattern with:destination).
+                ].
             ].
         ].
 
@@ -2900,8 +2902,9 @@
         "/ s tab; nextPutLine:('@-mkdir "%1"/packages' bindWith:macOSDir).  dirsMade add:(macOSDir,'/packages').
         "/ s tab; nextPutLine:('@$(MAKE) RESOURCEFILES RESOURCES="%1"' bindWith:resourcesDir).
         s tab; nextPutLine:('@-mkdir "%1"' bindWith:resourcesDir).  dirsMade add:resourcesDir.
-        s tab; nextPutLine:('@-mkdir "%1"' bindWith:packagesDir).  dirsMade add:packagesDir.
-        s tab; nextPutLine:('@$(MAKE) RESOURCEFILES RESOURCES="%1"' bindWith:packagesDir).
+        "/ s tab; nextPutLine:('@-mkdir "%1"' bindWith:packagesDir).  dirsMade add:packagesDir.
+        "/ s tab; nextPutLine:('@$(MAKE) RESOURCEFILES RESOURCES="%1"' bindWith:packagesDir).
+        s tab; nextPutLine:('@$(MAKE) RESOURCEFILES RESOURCES="%1"' bindWith:resourcesDir).
         s tab; nextPutLine:('cp "',self applicationName,'" "',macOSDir,'/"').
         s tab; nextPutLine:('@-cp osx/Info.plist "',contentsDir,'/"').
         self osxDmgBackgroundImageFile notNil ifTrue:[
@@ -2913,7 +2916,9 @@
         ].    
         self additionalTargetDirectoriesToMakeForInstall_osx do:[:each | genLine value:s value:'MacOS' value:{ nil . each}].     
         "/ s tab; nextPutLine:('@-cp osx/PkgInfo "',contentsDir,'/"').
-        self commonFilesToInstall_unix do:[:eachPair | genLine value:s value:'MacOS' value:eachPair].
+        self commonFilesToInstall_unix do:[:eachPair | 
+                genLine value:s value:'MacOS' value:eachPair
+        ].
         s tab; nextPutLine:('@-rm "%1/"*WINrc.rc' bindWith:macOSDir).
         s tab; nextPutLine:('@-rm "%1/"*WinRC.rc' bindWith:macOSDir).
         self additionalFilesToInstall_unix do:[:eachPair | genLine value:s value:'MacOS' value:eachPair].
@@ -2927,7 +2932,7 @@
     ].
 
     "Modified: / 24-02-2017 / 16:37:22 / cg"
-    "Modified: / 24-10-2018 / 20:58:37 / Claus Gittinger"
+    "Modified: / 25-10-2018 / 02:01:22 / Claus Gittinger"
 !
 
 osxPkgDistributionScript