[[ Bug 20173 ]] Build universal solution for LCFM

montegoulding · montegoulding · commit bae05676e7fa · 2017-07-26T11:47:34.000+10:00
diff --git a/buildbot.mk b/buildbot.mk
@@ -286,22 +286,25 @@ distmac-extract:
 	$(buildtool_command) --platform mac --stage fmpackage --debug; \
 	$(buildtool_command) --platform win-x86 --stage fmpackage --debug; \
 	$(buildtool_command) --platform win-x86_64 --stage fmpackage --debug; \
+	$(buildtool_command) --platform universal --stage fmpackage --debug; \
 	find . -maxdepth 1 -name 'LiveCodeForFM-Mac-*.fmp12' -print0 \
 	    | xargs -0 zip -r LiveCodeForFM-Mac-Solution.zip; \
 	find . -maxdepth 1 -name 'LiveCodeForFM-Win-x86-*.fmp12' -print0 \
 	    | xargs -0 zip -r LiveCodeForFM-Win-x86-Solution.zip; \
 	find . -maxdepth 1 -name 'LiveCodeForFM-Win-x86_64-*.fmp12' -print0 \
 	    | xargs -0 zip -r LiveCodeForFM-Win-x86_64-Solution.zip
+	find . -maxdepth 1 -name 'LiveCodeForFM-[1-9]*.fmp12' -print0 \
+	    | xargs -0 zip -r LiveCodeForFM.zip \
 	find . -maxdepth 1 -name 'LiveCodeForFM-*.fmp12' -print0 \
 	    | xargs -0 zip -r LiveCodeForFM-All-Solutions.zip
 	find . -maxdepth 1 -name 'livecodeforfm-*.*' -print0 \
-	    | xargs -0 zip -r LiveCodeForFM-All-Plugins.zip
+	    | xargs -0 zip -r LiveCodeForFM-All-Plugins.zip \
 	find . -maxdepth 1 -name 'livecodeforfm-*.fmplugin' -print0 \
-	    | xargs -0 zip -r LiveCodeForFM-Mac-Plugin.zip
+	    | xargs -0 zip -r LiveCodeForFM-Mac-Plugin.zip \
 	find . -maxdepth 1 -name 'livecodeforfm-*.fmx' -print0 \
-	    | xargs -0 zip -r LiveCodeForFM-Win-x86-Plugin.zip
+	    | xargs -0 zip -r LiveCodeForFM-Win-x86-Plugin.zip \
 	find . -maxdepth 1 -name 'livecodeforfm-*.fmx64' -print0 \
-	    | xargs -0 zip -r LiveCodeForFM-Win-x86_64-Plugin.zip
+	    | xargs -0 zip -r LiveCodeForFM-Win-x86_64-Plugin.zip \
 	find . -maxdepth 1 -name 'LiveCodeForFM.fmp12' -print0 \
 	    | xargs -0 zip -r LiveCodeForFM-Solution.zip
 
diff --git a/builder/builder_tool.livecodescript b/builder/builder_tool.livecodescript
@@ -31,7 +31,7 @@ on startup
    repeat while tArgIndex is among the keys of tArgs
       if tArgs[tArgIndex] is "--platform" then
          get tArgs[tArgIndex + 1]
-         if it is not among the items of "windows,win,win-x86,win-x86_64,macosx,mac,linux,linux-x86,linux-x86_64" then
+         if it is not among the items of "windows,win,win-x86,win-x86_64,macosx,mac,linux,linux-x86,linux-x86_64,universal" then
             __builderLog "error", "Unknown platform '" & tArgs[tArgIndex + 1] & "'"
          end if
          -- Hack the arch from the platform. This should really use
