Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 66ba523

Browse files
montegouldingmontegoulding
committed
[[ Win x86_64 ]] Update package script for x86_64 Windows installer
This patch updates the package script to allow for multiple windows architectures to be built.
1 parent 0d59caf commit 66ba523

File tree

1 file changed

+51
-43
lines changed

1 file changed

+51
-43
lines changed

‎Installer/package.txt‎

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ installer LiveCode
4242
include Externals
4343
with TargetFolder as [[ToolsFolder]]/Runtime/Windows/x86-32 do
4444
set TargetPlatform to Windows
45+
set TargetArchitecture to x86
46+
include Runtime
47+
include Externals
48+
with TargetFolder as [[ToolsFolder]]/Runtime/Windows/x86-64 do
49+
set TargetPlatform to Windows
50+
set TargetArchitecture to x86_64
4551
include Runtime
4652
include Externals
4753
with TargetFolder as [[ToolsFolder]]/Runtime/Linux/x86-32 do
@@ -492,10 +498,10 @@ component Toolchain.MacOSX
492498

493499
component Toolchain.Windows
494500
into [[ToolsFolder]]/Toolchain place
495-
executable windows:lc-compile.exe as lc-compile.exe
496-
executable windows:lc-run.exe as lc-run.exe
497-
executable windows:lc-compile-ffi-java.exe as lc-compile-ffi-java.exe
498-
rfolder windows:modules
501+
executable win-[[TargetArchitecture]]:lc-compile.exe as lc-compile.exe
502+
executable win-[[TargetArchitecture]]:lc-run.exe as lc-run.exe
503+
executable win-[[TargetArchitecture]]:lc-compile-ffi-java.exe as lc-compile-ffi-java.exe
504+
rfolder win-[[TargetArchitecture]]:modules
499505

500506
component Toolchain.Linux
501507
into [[ToolsFolder]]/Toolchain place
@@ -520,13 +526,13 @@ component Mobile.Linux
520526

521527
component Engine.Windows
522528
into [[TargetFolder]] place
523-
executable windows:LiveCode[[EditionTagUpper]].exe as [[ProductName]].exe
524-
executable windows:revpdfprinter.dll
525-
executable windows:revsecurity.dll
529+
executable win-[[TargetArchitecture]]:LiveCode[[EditionTagUpper]].exe as [[ProductName]].exe
530+
executable win-[[TargetArchitecture]]:revpdfprinter.dll
531+
executable win-[[TargetArchitecture]]:revsecurity.dll
526532

527533
component Mobile.Windows
528534
into "[[ToolsFolder]]/Externals" place
529-
executable windows:revandroid.dll
535+
executable win-[[TargetArchitecture]]:revandroid.dll
530536

531537
//////////
532538

@@ -571,13 +577,13 @@ component Runtime.Linux
571577

572578
component Runtime.Windows
573579
into [[TargetFolder]] place
574-
executable windows:standalone[[BaseEditionTagLower]].exe as Standalone
575-
file "windows:w32-manifest-template.xml"
576-
file "windows:w32-manifest-template-dpiaware.xml"
577-
file "windows:w32-manifest-template-trustinfo.xml"
580+
executable win-[[TargetArchitecture]]:standalone[[BaseEditionTagLower]].exe as Standalone
581+
file "win-[[TargetArchitecture]]:w32-manifest-template.xml"
582+
file "win-[[TargetArchitecture]]:w32-manifest-template-dpiaware.xml"
583+
file "win-[[TargetArchitecture]]:w32-manifest-template-trustinfo.xml"
578584
into [[TargetFolder]]/Support place
579-
executable windows:revpdfprinter.dll
580-
executable windows:revsecurity.dll
585+
executable win-[[TargetArchitecture]]:revpdfprinter.dll
586+
executable win-[[TargetArchitecture]]:revsecurity.dll
581587
into "[[TargetFolder]]/Support/Sample Icons" place
582588
file "ide:Resources/Sample Icons/genericapp.ico"
583589
file "ide:Resources/Sample Icons/genericdoc.ico"
@@ -812,10 +818,10 @@ component Externals.Linux
812818

813819
component Externals.Windows
814820
into [[TargetFolder]]/Externals place
815-
executable windows:revspeech.dll
816-
executable windows:revxml.dll
817-
executable windows:revbrowser.dll
818-
executable windows:revzip.dll
821+
executable win-[[TargetArchitecture]]:revspeech.dll
822+
executable win-[[TargetArchitecture]]:revxml.dll
823+
executable win-[[TargetArchitecture]]:revbrowser.dll
824+
executable win-[[TargetArchitecture]]:revzip.dll
819825
declare external "Speech" using revspeech.dll
820826
declare external "XML" using revxml.dll
821827
declare external "Browser" using revbrowser.dll
@@ -856,26 +862,26 @@ component Externals.CEF.Linux
856862

857863
component Externals.CEF.Windows
858864
into [[TargetFolder]]/Externals/CEF place
859-
executable windows:libbrowser-cefprocess.exe
860-
executable windows:revbrowser-cefprocess.exe
861-
executable windows:Externals/CEF/libcef.dll
862-
executable windows:Externals/CEF/d3dcompiler_43.dll
863-
executable windows:Externals/CEF/d3dcompiler_47.dll
864-
executable windows:Externals/CEF/libEGL.dll
865-
executable windows:Externals/CEF/libGLESv2.dll
866-
executable windows:Externals/CEF/chrome_elf.dll
867-
rfolder windows:Externals/CEF/locales
868-
file windows:Externals/CEF/cef.pak
869-
file windows:Externals/CEF/cef_100_percent.pak
870-
file windows:Externals/CEF/cef_200_percent.pak
871-
file windows:Externals/CEF/cef_extensions.pak
872-
file windows:Externals/CEF/icudtl.dat
873-
file windows:Externals/CEF/natives_blob.bin
874-
file windows:Externals/CEF/snapshot_blob.bin
875-
file windows:Externals/CEF/v8_context_snapshot.bin
865+
executable win-[[TargetArchitecture]]:libbrowser-cefprocess.exe
866+
executable win-[[TargetArchitecture]]:revbrowser-cefprocess.exe
867+
executable win-[[TargetArchitecture]]:Externals/CEF/libcef.dll
868+
executable win-[[TargetArchitecture]]:Externals/CEF/d3dcompiler_43.dll
869+
executable win-[[TargetArchitecture]]:Externals/CEF/d3dcompiler_47.dll
870+
executable win-[[TargetArchitecture]]:Externals/CEF/libEGL.dll
871+
executable win-[[TargetArchitecture]]:Externals/CEF/libGLESv2.dll
872+
executable win-[[TargetArchitecture]]:Externals/CEF/chrome_elf.dll
873+
rfolder win-[[TargetArchitecture]]:Externals/CEF/locales
874+
file win-[[TargetArchitecture]]:Externals/CEF/cef.pak
875+
file win-[[TargetArchitecture]]:Externals/CEF/cef_100_percent.pak
876+
file win-[[TargetArchitecture]]:Externals/CEF/cef_200_percent.pak
877+
file win-[[TargetArchitecture]]:Externals/CEF/cef_extensions.pak
878+
file win-[[TargetArchitecture]]:Externals/CEF/icudtl.dat
879+
file win-[[TargetArchitecture]]:Externals/CEF/natives_blob.bin
880+
file win-[[TargetArchitecture]]:Externals/CEF/snapshot_blob.bin
881+
file win-[[TargetArchitecture]]:Externals/CEF/v8_context_snapshot.bin
876882
into [[TargetFolder]]/Externals/CEF/swiftshader place
877-
executable windows:Externals/CEF/swiftshader/libEGL.dll
878-
executable windows:Externals/CEF/swiftshader/libGLESv2.dll
883+
executable win-[[TargetArchitecture]]:Externals/CEF/swiftshader/libEGL.dll
884+
executable win-[[TargetArchitecture]]:Externals/CEF/swiftshader/libGLESv2.dll
879885

880886
////////////////////////////////////////////////////////////////////////////////
881887

@@ -897,12 +903,12 @@ component Databases.Linux
897903

898904
component Databases.Windows
899905
into "[[TargetFolder]]/Externals" place
900-
executable windows:revdb.dll
906+
executable win-[[TargetArchitecture]]:revdb.dll
901907
into "[[TargetFolder]]/Externals/Database Drivers" place
902-
executable windows:dbmysql.dll
903-
executable windows:dbodbc.dll
904-
executable windows:dbpostgresql.dll
905-
executable windows:dbsqlite.dll
908+
executable win-[[TargetArchitecture]]:dbmysql.dll
909+
executable win-[[TargetArchitecture]]:dbodbc.dll
910+
executable win-[[TargetArchitecture]]:dbpostgresql.dll
911+
executable win-[[TargetArchitecture]]:dbsqlite.dll
906912
declare external "Database" using revdb.dll
907913
declare dbdriver "MySQL" using dbmysql.dll
908914
declare dbdriver "ODBC" using dbodbc.dll
@@ -977,7 +983,9 @@ component TimeZone
977983
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
978984
rfolder ios:iphoneos12.1/packaged_extensions/com.livecode.library.timezone/code
979985
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
980-
rfolder windows:packaged_extensions/com.livecode.library.timezone/code
986+
rfolder win-x86:packaged_extensions/com.livecode.library.timezone/code
987+
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
988+
rfolder win-x86_64:packaged_extensions/com.livecode.library.timezone/code
981989
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
982990
rfolder linux-x86_64:packaged_extensions/com.livecode.library.timezone/code
983991
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place

0 commit comments

Comments
 (0)