Miscellaneous windows installer fixes:

ketan · ketan · commit 3e88caf9642f · 2016-07-26T17:58:10.000+05:30
* Ruby's `foo = a||b` is not the same as groovy's `foo = a||b`
* Use the correct source path while copying agent files
* Setup a systemproperty that javasysmon requires.
* Add empty tmp dir for windows agent and server
* Align the text box properly
diff --git a/buildSrc/src/main/groovy/com/thoughtworks/go/build/WindowsPackagingTask.groovy b/buildSrc/src/main/groovy/com/thoughtworks/go/build/WindowsPackagingTask.groovy
@@ -97,7 +97,7 @@ class WindowsPackagingTask extends DefaultTask {
           'REGVER'           : "${version}${distVersion.padRight(5, '0')}".replaceAll(/\./, ''),
           'JAVA'             : 'jre',
           'JAVASRC'          : jreDir,
-          'DISABLE_LOGGING'  : (System.getenv('DISABLE_WIN_INSTALLER_LOGGING') || 'false'),
+          'DISABLE_LOGGING'  : System.getenv('DISABLE_WIN_INSTALLER_LOGGING') ?: false,
           'OUTDIR'           : "${project.convention.plugins.get("base").distsDir}/win"
       ]
 
diff --git a/installers/go-agent/win/ServerURL.ini b/installers/go-agent/win/ServerURL.ini
@@ -6,13 +6,13 @@ Type=Label
 Left=5
 Right=-5
 Top=10
-Bottom=20
-Text=" Enter the URL of your Go Server (must be https, and end with /go). Example https://127.0.0.1:8154/go: "
+Bottom=30
+Text="Enter the URL of your Go Server (must be https, and end with /go). Example https://127.0.0.1:8154/go: "
 
 [Field 2]
 Type=Text
 Left=5
 Right=-5
-Top=30
-Bottom=40
+Top=40
+Bottom=50
 Text="127.0.0.1"
diff --git a/installers/go-server/win/config/wrapper-server.conf b/installers/go-server/win/config/wrapper-server.conf
@@ -62,7 +62,7 @@ wrapper.java.additional.7="-Dcruise.config.dir=%CRUISE_SERVER_DIR%\config"
 wrapper.java.additional.8="-Dcruise.config.file=%CRUISE_SERVER_DIR%\config\cruise-config.xml"
 wrapper.java.additional.9=-DreservedForFuture.1
 wrapper.java.additional.10=-DreservedForFuture.2
-wrapper.java.additional.11=-DreservedForFuture.3
+wrapper.java.additional.11="-DJAVA_SYS_MON_TEMP_DIR=%CRUISE_SERVER_DIR%\tmp"
 wrapper.java.additional.12=%JVM_DEBUG%
 wrapper.java.additional.13=%GC_LOG%
 wrapper.java.additional.14=-DreservedForFuture.4
diff --git a/installers/windows.gradle b/installers/windows.gradle
@@ -44,18 +44,16 @@ task agentWindowsExe(type: WindowsPackagingTask, dependsOn: [':agent-bootstrappe
     project.copy {
       from(configurations.agentBootstrapperJar.singleFile.path) into(versionedDir()) rename ".*", "agent-bootstrapper.jar"
     }
-    project.copy { from('agent/release/agent.cmd') into(versionedDir()) }
-    project.copy { from('agent/release/start-agent.bat') into(versionedDir()) }
-    project.copy { from('agent/release/stop-agent.bat') into(versionedDir()) }
-    project.copy { from('agent/release/README.md') into(versionedDir()) }
-    project.copy { from('agent/win/cruisewrapper.exe') into(versionedDir()) }
-
-    project.copy {
-      from(project(':agent').file('properties/log4j.properties')) into("${versionedDir()}/config/log4j.properties")
-    }
-
+    project.copy { from('go-agent/release/agent.cmd') into(versionedDir()) }
+    project.copy { from('go-agent/release/start-agent.bat') into(versionedDir()) }
+    project.copy { from('go-agent/release/stop-agent.bat') into(versionedDir()) }
+    project.copy { from('go-agent/release/README.md') into(versionedDir()) }
+    project.copy { from('go-agent/win/cruisewrapper.exe') into(versionedDir()) }
+    project.copy { from(project(':agent').file('properties/log4j.properties')) into("${versionedDir()}/config") }
     project.copy { from('go-agent/win/config') into("${versionedDir()}/config") }
     project.copy { from('go-agent/win/lib') into("${versionedDir()}/lib") }
+
+    project.file("${versionedDir()}/tmp").mkdirs()
   }
 }
 
@@ -92,6 +90,8 @@ task serverWindowsExe(type: WindowsPackagingTask, dependsOn: [':server-launcher:
 
     project.copy { from('go-server/win/config') into("${versionedDir()}/config") }
     project.copy { from('go-server/win/lib') into("${versionedDir()}/lib") }
+
+    project.file("${versionedDir()}/tmp").mkdirs()
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ class WindowsPackagingTask extends DefaultTask {`
`97`	`97`	`'REGVER' : "${version}${distVersion.padRight(5, '0')}".replaceAll(/\./, ''),`
`98`	`98`	`'JAVA' : 'jre',`
`99`	`99`	`'JAVASRC' : jreDir,`
`100`		`- 'DISABLE_LOGGING' : (System.getenv('DISABLE_WIN_INSTALLER_LOGGING') \|\| 'false'),`
	`100`	`+ 'DISABLE_LOGGING' : System.getenv('DISABLE_WIN_INSTALLER_LOGGING') ?: false,`
`101`	`101`	`'OUTDIR' : "${project.convention.plugins.get("base").distsDir}/win"`
`102`	`102`	`]`
`103`	`103`