#2268: use correct syntax for innosetup comments, don't bundle openss…

…h by default

git-svn-id: https://xpra.org/svn/Xpra/trunk@22373 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/win32/MINGW_BUILD.sh

@@ -18,7 +18,7 @@ RUN_INSTALLER=${RUN_INSTALLER:-1}
 DO_MSI=${DO_MSI:-0}
 DO_SIGN=${DO_SIGN:-1}
 BUNDLE_PUTTY=${BUNDLE_PUTTY:-1}
-BUNDLE_OPENSSH=${BUNDLE_OPENSSH:-1}
+BUNDLE_OPENSSH=${BUNDLE_OPENSSH:-0}
 BUNDLE_OPENSSL=${BUNDLE_OPENSSL:-1}
 ZIP_MODULES=${ZIP_MODULES:-1}
 

src/win32/xpra.iss

@@ -5,14 +5,14 @@ AppVersion=3.0
 AppVerName=Xpra 3.0
 UninstallDisplayName=Xpra 3.0
 AppPublisher=xpra.org
-AppPublisherURL=http://xpra.org/
+AppPublisherURL=http:;xpra.org/
 DefaultDirName={pf}\Xpra
 DefaultGroupName=Xpra
 DisableProgramGroupPage=true
 OutputDir=dist
 OutputBaseFilename=Xpra_Setup
-//Compression=none
-//Compression=lzma2/fast
+;Compression=none
+;Compression=lzma2/fast
 Compression=lzma2/max
 SolidCompression=yes
 AllowUNCPath=false
@@ -108,7 +108,7 @@ begin
 	    FWMIService := Unassigned;
 	    FSWbemLocator := Unassigned;
 	except
-		//MsgBox('Warning: failed to check for existing process', mbError, MB_OK);
+		;MsgBox('Warning: failed to check for existing process', mbError, MB_OK);
 	end;
 end;
 
@@ -121,7 +121,7 @@ begin
   begin
       nMsgBoxResult := MsgBox('Xpra is already running, you must stop it to proceed.', mbInformation, MB_RETRYCANCEL);
   end;
-  // if Cancel is pressed
+  ; if Cancel is pressed
   if nMsgBoxResult = IDCANCEL then
   begin
     Result := False;
@@ -137,7 +137,7 @@ begin
   begin
       nMsgBoxResult := MsgBox('Xpra is still running, you must stop it to be able to uninstall everything.', mbInformation, MB_RETRYCANCEL);
   end;
-  // if Cancel is pressed
+  ; if Cancel is pressed
   if nMsgBoxResult = IDCANCEL then
   begin
     Result := False;
@@ -157,14 +157,14 @@ begin
     openssl := ExpandConstant('{app}\OpenSSL.exe');
     Exec(openssl, args, '', SW_HIDE, ewWaitUntilTerminated, ResultCode);
   end;
-  // move old config file:
+  ; move old config file:
   config := ExpandConstant('{app}\xpra.conf');
   saved_config := ExpandConstant('{app}\etc\xpra.conf.bak');
   if (FileExists(config)) then
   begin
 	RenameFile(config, saved_config);
   end;
-  //ssh host key:
+  ;ssh host key:
   ssh_keygen := ExpandConstant('{app}\ssh-keygen.exe');
   if (FileExists(ssh_keygen)) then
   begin
@@ -203,15 +203,15 @@ var
   sUnInstallString: String;
   iResultCode: Integer;
 begin
-// Return Values:
-// 1 - uninstall string is empty
-// 2 - error executing the UnInstallString
-// 3 - successfully executed the UnInstallString
+; Return Values:
+; 1 - uninstall string is empty
+; 2 - error executing the UnInstallString
+; 3 - successfully executed the UnInstallString
 
-  // default return value
+  ; default return value
   Result := 0;
 
-  // get the uninstall string of the old app
+  ; get the uninstall string of the old app
   sUnInstallString := GetUninstallString();
   if sUnInstallString <> '' then begin
     sUnInstallString := RemoveQuotes(sUnInstallString);