From b558b922b460a284c1116a7876fa5ce5ffafd5e6 Mon Sep 17 00:00:00 2001 From: Martin Weismann Date: Thu, 25 Aug 2022 13:36:47 +0200 Subject: [PATCH] Finish merge of build.bat --- Build/build.bat | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/Build/build.bat b/Build/build.bat index a0e721cf..9298216f 100644 --- a/Build/build.bat +++ b/Build/build.bat @@ -4,7 +4,6 @@ set basepath="%~dp0" cd %basepath%\..\Source set Sources=actutils.go automaticcomponenttoolkit.go buildbindingccpp.go buildbindingccppdocumentation.go buildbindingcsharp.go buildbindinggo.go buildbindingnode.go buildbindingpascal.go buildbindingpython.go buildimplementationcpp.go buildbindingjava.go buildimplementationpascal.go componentdefinition.go componentdiff.go languagewriter.go languagec.go languagecpp.go languagepascal.go -<<<<<<< HEAD set GOOS=windows set GOARCH=amd64 @@ -12,31 +11,15 @@ echo "Build act.win64.exe" go build -o ..\act.win64.exe %Sources% echo "Patching properties of act.win64.exe" -..\build\verpatch ..\act.win64.exe /high /va 1.7.0 /pv "1.7.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit" +..\build\verpatch ..\act.win64.exe /high /va 1.8.0 /pv "1.8.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit" set GOOS=windows -======= - -set GOOS=windows -set GOARCH=amd64 -echo "Build act.exe" -go build -o ..\act.win64.exe %Sources% - -echo "Patching properties of act.win64.exe" -..\build\verpatch ..\act.win64.exe /high /va 1.7.0 /pv "1.7.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit" - -set GOOS=windows ->>>>>>> ADSK/develop set GOARCH=386 echo "Build act.win32.exe" go build -o ..\act.win32.exe %Sources% -<<<<<<< HEAD echo "Patching properties of act.win32.exe" -======= -echo "Patching properties of act_win32.exe" ->>>>>>> ADSK/develop -..\build\verpatch ..\act.win32.exe /high /va 1.7.0 /pv "1.7.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit" +..\build\verpatch ..\act.win32.exe /high /va 1.8.0 /pv "1.8.0-develop" /s copyright "(c) 2018-2019 ACT Developers" /s desc "ACT is a code generator for software components" /s productName "Automatic Component Toolkit" set GOOS=linux set GOARCH=amd64