Merge remote-tracking branch 'origin/develop-6.7' into develop-7.0

livecodesebastien · livecodesebastien · commit 425f053764d2 · 2015-07-16T18:15:22.000+01:00
diff --git a/config/android.gypi b/config/android.gypi
@@ -46,6 +46,7 @@
 		'cflags':
 		[
 			'-fstrict-aliasing',
+			'-fvisibility=hidden',
 		],
 		
 		'cflags_c':
diff --git a/docs/notes/bugfix-15572.md b/docs/notes/bugfix-15572.md
@@ -0,0 +1 @@
+# French application menu is not translated.
diff --git a/engine/app-bundle-template.gypi b/engine/app-bundle-template.gypi
@@ -19,9 +19,24 @@
 				'mac_bundle_resources':
 				[
 					'rsrc/LiveCode-Community.rsrc',
+					'rsrc/Dutch.lproj/Localisation.strings',
 					'rsrc/English.lproj/Localisation.strings',
-					'rsrc/LiveCodeDoc.icns',
-					'rsrc/LiveCode.icns',
+					'rsrc/French.lproj/Localisation.strings',
+					'rsrc/German.lproj/Localisation.strings',
+					'rsrc/Italian.lproj/Localisation.strings',
+					'rsrc/Japanese.lproj/Localisation.strings',
+					'rsrc/Spanish.lproj/Localisation.strings',
+					'rsrc/ar.lproj/Localisation.strings',
+					'rsrc/da.lproj/Localisation.strings',
+					'rsrc/fi.lproj/Localisation.strings',
+					'rsrc/he.lproj/Localisation.strings',
+					'rsrc/ko.lproj/Localisation.strings',
+					'rsrc/no.lproj/Localisation.strings',
+					'rsrc/pt.lproj/Localisation.strings',
+					'rsrc/ru.lproj/Localisation.strings',
+					'rsrc/sv.lproj/Localisation.strings',
+					'rsrc/zh_CN.lproj/Localisation.strings',
+					'rsrc/zh_TW.lproj/Localisation.strings',
 				],
 	
 				'xcode_settings':
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -207,6 +207,11 @@
 					'OS == "mac"',
 					{
 						'product_name': 'Standalone-Community',
+						'mac_bundle_resources':
+						[
+							'rsrc/Standalone.icns',
+							'rsrc/StandaloneDoc.icns',
+						],
 					},
 				],
 				[
@@ -451,6 +456,10 @@
 					'OS == "mac"',
 					{
 						'product_name': 'Installer',
+						'mac_bundle_resources':
+						[
+							'rsrc/Installer.icns',
+						],
 					},
 				],
 				[
@@ -552,6 +561,11 @@
 					'OS == "mac"',
 					{
 						'product_name': 'LiveCode-Community',
+						'mac_bundle_resources':
+						[
+							'rsrc/LiveCode.icns',
+							'rsrc/LiveCodeDoc.icns',
+						],
 					},
 				],
 				[
diff --git a/ide-support/revsaveasstandalone.livecodescript b/ide-support/revsaveasstandalone.livecodescript
@@ -290,6 +290,7 @@ on revSaveAsStandalone pStack, pFolder, pPreview
       
       put the mainStack of stack pStack into pStack
       set the defaultStack to pStack
+      put the destroyStack of stack pStack into tOldDestroy
       try
          if sStandaloneSettingsA["ios"] or sStandaloneSettingsA["android"] then
             local tOutputMobileFolder
@@ -326,6 +327,7 @@ on revSaveAsStandalone pStack, pFolder, pPreview
          end if
       catch tError
          revAbort
+         set the destroyStack of stack pStack to tOldDestroy
          if word 1 of tError = "Standalone:" then 
             if revTestEnvironment() then
                return word 2 to -1 of tError
@@ -343,6 +345,7 @@ on revSaveAsStandalone pStack, pFolder, pPreview
       end try
       
       revReset
+      set the destroyStack of stack pStack to tOldDestroy
       
       if revStandaloneGetWarnings() is not empty then
          set the cWarnings of stack "revBuildResults" to revStandaloneGetWarnings()
@@ -546,6 +549,10 @@ private command revCreateStandalone pStack, pFolder
       dispatch "savingStandalone" to stack tStackFileName
    end try
    
+   // SN-2015-07-16: [[ ObjectDeletion ]] Make sure that the stack won't get removed from
+   //  memory (now it would get deleted sooner after that it used to do)
+   set the destroyStack of stack pStack to false
+   
    --build a list of output directories
    if last char of pFolder is not slash then 
       put slash after pFolder

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`'cflags':`
`47`	`47`	`[`
`48`	`48`	`'-fstrict-aliasing',`
	`49`	`+ '-fvisibility=hidden',`
`49`	`50`	`],`
`50`	`51`
`51`	`52`	`'cflags_c':`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# French application menu is not translated.`
Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,11 @@`
`207`	`207`	`'OS == "mac"',`
`208`	`208`	`{`
`209`	`209`	`'product_name': 'Standalone-Community',`
	`210`	`+ 'mac_bundle_resources':`
	`211`	`+ [`
	`212`	`+ 'rsrc/Standalone.icns',`
	`213`	`+ 'rsrc/StandaloneDoc.icns',`
	`214`	`+ ],`
`210`	`215`	`},`
`211`	`216`	`],`
`212`	`217`	`[`
`@@ -451,6 +456,10 @@`
`451`	`456`	`'OS == "mac"',`
`452`	`457`	`{`
`453`	`458`	`'product_name': 'Installer',`
	`459`	`+ 'mac_bundle_resources':`
	`460`	`+ [`
	`461`	`+ 'rsrc/Installer.icns',`
	`462`	`+ ],`
`454`	`463`	`},`
`455`	`464`	`],`
`456`	`465`	`[`
`@@ -552,6 +561,11 @@`
`552`	`561`	`'OS == "mac"',`
`553`	`562`	`{`
`554`	`563`	`'product_name': 'LiveCode-Community',`
	`564`	`+ 'mac_bundle_resources':`
	`565`	`+ [`
	`566`	`+ 'rsrc/LiveCode.icns',`
	`567`	`+ 'rsrc/LiveCodeDoc.icns',`
	`568`	`+ ],`
`555`	`569`	`},`
`556`	`570`	`],`
`557`	`571`	`[`