From 41ac2e083baf18d458cbe63166fceb243223a964 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Wed, 2 Jan 2019 23:10:40 +0100
Subject: [PATCH] update version and add config to build full 64 bit win rlz,
 close #367

---
 setup/.gitignore                              |  1 +
 setup/setup.dprj                              | 46 ++++++++++++++++---
 ...pzip-win32.bat => setupzip-win-noarch.bat} |  0
 setup/version.txt                             |  2 +-
 setup/zip-win64.bat                           | 10 ++++
 5 files changed, 51 insertions(+), 8 deletions(-)
 rename setup/{setupzip-win32.bat => setupzip-win-noarch.bat} (100%)
 create mode 100644 setup/zip-win64.bat

diff --git a/setup/.gitignore b/setup/.gitignore
index 3d56c5ec..7f4758b3 100644
--- a/setup/.gitignore
+++ b/setup/.gitignore
@@ -25,5 +25,6 @@ temp
 nux32
 nux64
 win32
+win64
 output
 ppas.bat
diff --git a/setup/setup.dprj b/setup/setup.dprj
index 4af62e4e..d2f43029 100644
--- a/setup/setup.dprj
+++ b/setup/setup.dprj
@@ -1,5 +1,5 @@
-object CurrentProject: TCENativeProject
-  OptionsCollection = <  
+object CurrentProject: TNativeProject
+  OptionsCollection = <
     item
       name = 'win32'
       messagesOptions.tlsInformations = True
@@ -21,14 +21,46 @@ object CurrentProject: TCENativeProject
         ' zip-win32.bat'
       )
       preBuildProcess.showWindow = swoHIDE
-      postBuildProcess.executable = 'setupzip-win32.bat'
+      postBuildProcess.executable = 'setupzip-win-noarch.bat'
       postBuildProcess.workingDirectory = '<CPP>'
       postBuildProcess.options = [poUsePipes, poStderrToOutPut]
       postBuildProcess.parameters.Strings = (
         '<CPO>'
       )
       postBuildProcess.showWindow = swoHIDE
-    end  
+    end
+    item
+      name = 'win64'
+      messagesOptions.tlsInformations = True
+      outputOptions.inlining = True
+      outputOptions.boundsCheck = offAlways
+      outputOptions.optimizations = True
+      outputOptions.release = True
+      pathsOptions.outputFilename = 'output/dexed.<CPV>.win64.setup'
+      pathsOptions.importStringPaths.Strings = (
+        'win64/'
+        '<CPP>'
+      )
+      pathsOptions.forceExtension = True
+      otherOptions.dmdOtherOptions.Strings = (
+        '-m64'
+      )
+      preBuildProcess.executable = 'cmd'
+      preBuildProcess.workingDirectory = '<CPP>'
+      preBuildProcess.options = [poUsePipes, poStderrToOutPut]
+      preBuildProcess.parameters.Strings = (
+        '/c'
+        ' zip-win64.bat'
+      )
+      preBuildProcess.showWindow = swoHIDE
+      postBuildProcess.executable = 'setupzip-win-noarch.bat'
+      postBuildProcess.workingDirectory = '<CPP>'
+      postBuildProcess.options = [poUsePipes, poStderrToOutPut]
+      postBuildProcess.parameters.Strings = (
+        '<CPO>'
+      )
+      postBuildProcess.showWindow = swoHIDE
+    end
     item
       name = 'nux32'
       outputOptions.inlining = True
@@ -53,7 +85,7 @@ object CurrentProject: TCENativeProject
         'setupzip-nux-noarch.sh'
         '<CPO>'
       )
-    end  
+    end
     item
       name = 'nux64'
       outputOptions.inlining = True
@@ -83,6 +115,6 @@ object CurrentProject: TCENativeProject
   Sources.Strings = (
     'setup.d'
   )
-  ConfigurationIndex = 2
-  version = '3.6.21'
+  ConfigurationIndex = 3
+  version = '3.7.0'
 end
diff --git a/setup/setupzip-win32.bat b/setup/setupzip-win-noarch.bat
similarity index 100%
rename from setup/setupzip-win32.bat
rename to setup/setupzip-win-noarch.bat
diff --git a/setup/version.txt b/setup/version.txt
index fb5a3847..d1e9cf3b 100644
--- a/setup/version.txt
+++ b/setup/version.txt
@@ -1 +1 @@
-v3.6.21
+v3.7.0
diff --git a/setup/zip-win64.bat b/setup/zip-win64.bat
new file mode 100644
index 00000000..477300c9
--- /dev/null
+++ b/setup/zip-win64.bat
@@ -0,0 +1,10 @@
+set /p ver=<version.txt
+set ver=%ver:~1%
+cd win64
+:: assuming 7zip binary folder is somewhere in PATH
+7z a -tzip -mx9^
+ ..\output\dexed.%ver%.win64.zip^
+ dcd.license.txt dexed.license.txt^
+ dexed.exe dastworx.exe^
+ dexed.ico dexed.png^
+ dcd-server.exe dcd-client.exe dscanner.exe