Misc XGUI fixes.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2836 e7ae566f-a301-0410-adde-c780ea21d3b5

domake-win

@@ -126,12 +126,12 @@ install-win32/getpkcs11helper
 # Get the OpenVPN GUI (must be prebuilt)
 install-win32/getgui
 
-# Get the OpenVPN XML-based GUI (must be prebuilt)
-install-win32/getxgui
-
 # Produce the license text, install README, and sample config files
 install-win32/maketext
 
+# Get the OpenVPN XML-based GUI (must be prebuilt)
+install-win32/getxgui
+
 # This final step builds the OpenVPN installer using generated
 # files from GENOUT
 install-win32/buildinstaller

install-win32/maketext

@@ -9,7 +9,7 @@ mkdir -p $GENOUT/text &>/dev/null
 cat COPYING COPYRIGHT.GPL >$GENOUT/text/license.txt
 
 # copy install file
-cp INSTALL-win32.txt $GENOUT/text/install-win32.txt
+cp INSTALL-win32.txt $GENOUT/text/INSTALL-win32.txt
 
 # copy sample configuration files and docs
 s=$GENOUT/samples

install-win32/openvpn.nsi

@@ -64,7 +64,8 @@
 !define XGUI_XMLSERV  ovpn-xmlserv.exe
 !define XGUI_HTDOCS   htdocs
 
-!define XGUI_AJAX_GUI_NAME "${PRODUCT_NAME} Ajax GUI"
+!define XGUI_AJAX_GUI_NAME       "${PRODUCT_NAME} Ajax GUI"
+!define XGUI_TRANSITION_GUI_NAME "${PRODUCT_NAME} Transitional GUI"
 
 ;--------------------------------
 ;Configuration
@@ -94,9 +95,13 @@
   !define MUI_COMPONENTSPAGE_TEXT_TOP "Select the components to install/upgrade.  Stop any ${PRODUCT_NAME} processes or the ${PRODUCT_NAME} service if it is running.  All DLLs are installed locally."
 
   !define MUI_COMPONENTSPAGE_SMALLDESC
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\INSTALL-win32.txt"
+  !ifdef USE_XGUI
+    !define MUI_FINISHPAGE_SHOWREADME "http://openvpn.net/"
+    !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+  !else
+    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\INSTALL-win32.txt"
+  !endif
   !define MUI_FINISHPAGE_NOAUTOCLOSE
-#  !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
   !define MUI_ABORTWARNING
   !define MUI_ICON "${HOME}\images\${PRODUCT_ICON}"
   !define MUI_UNICON "${HOME}\images\${PRODUCT_ICON}"
@@ -488,7 +493,9 @@ Section -post
   ; Store README, license, icon
   SetOverwrite on
   SetOutPath $INSTDIR
-  File "${GEN}\text\INSTALL-win32.txt"
+  !ifndef USE_XGUI
+    File "${GEN}\text\INSTALL-win32.txt"
+  !endif
   File "${GEN}\text\license.txt"
   File "${HOME}\images\${PRODUCT_ICON}"
 
@@ -629,8 +636,8 @@ Section -post
  tryaddxgui:
   !ifdef USE_XGUI
     IfFileExists "$INSTDIR\bin\${XGUI_EXE}" "" tryaddtray
-      CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} GUI.lnk" "$INSTDIR\bin\${XGUI_EXE}" ""
-      CreateShortcut "$DESKTOP\${PRODUCT_NAME} GUI.lnk" "$INSTDIR\bin\${XGUI_EXE}"
+      CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${XGUI_TRANSITION_GUI_NAME}.lnk" "$INSTDIR\bin\${XGUI_EXE}" ""
+#      CreateShortcut "$DESKTOP\${XGUI_TRANSITION_GUI_NAME}.lnk" "$INSTDIR\bin\${XGUI_EXE}"
  tryaddtray:
     IfFileExists "$INSTDIR\bin\${XGUI_TRAY}" "" tryaddtap
       CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${XGUI_AJAX_GUI_NAME}.lnk" "$INSTDIR\bin\${XGUI_EXE}" ""
@@ -719,18 +726,18 @@ FunctionEnd
 
 Section "Uninstall"
 
-  ; Stop OpenVPN if currently running
-  DetailPrint "Service REMOVE"
-  nsExec::ExecToLog '"$INSTDIR\bin\${PRODUCT_UNIX_NAME}serv.exe" -remove'
-  Pop $R0 # return value/error/timeout
-
 !ifdef USE_XGUI
   DetailPrint "XML Service REMOVE"
   nsExec::ExecToLog '"$INSTDIR\bin\${XGUI_XMLSERV}" -remove'
   Pop $R0 # return value/error/timeout
 !endif
 
-  Sleep 2000
+  ; Stop OpenVPN if currently running
+  DetailPrint "Service REMOVE"
+  nsExec::ExecToLog '"$INSTDIR\bin\${PRODUCT_UNIX_NAME}serv.exe" -remove'
+  Pop $R0 # return value/error/timeout
+
+  Sleep 3000
 
   DetailPrint "TAP REMOVE"
   nsExec::ExecToLog '"$INSTDIR\bin\tapinstall.exe" remove ${TAP}'
@@ -766,7 +773,7 @@ Section "Uninstall"
     Delete "$INSTDIR\bin\${XGUI_XMLSERV}"
     RMDir /r "$INSTDIR\${XGUI_HTDOCS}"
     Delete "$DESKTOP\${XGUI_AJAX_GUI_NAME}.lnk"
-    Delete "$DESKTOP\${PRODUCT_NAME} GUI.lnk"
+    Delete "$DESKTOP\${XGUI_TRANSITION_GUI_NAME}.lnk"
   !endif
 
   Delete "$INSTDIR\bin\${PRODUCT_UNIX_NAME}.exe"

install-win32/settings.in

@@ -47,9 +47,6 @@
 ; visible=0x81  hidden=0x89
 !define PRODUCT_TAP_CHARACTERISTICS     0x81
 
-# hide tap warning
-;!define PRODUCT_TAP_HIDE_WARN
-
 # Build debugging version of TAP driver
 ;!define PRODUCT_TAP_DEBUG