svn commit: r1767544 - in /directory/studio/trunk/installers/windows: pom.xml src/nsis/AdvUninstLog.nsh src/nsis/windows_installer.nsi

[se...@apache.org]

Author: seelmann
Date: Tue Nov  1 18:33:26 2016
New Revision: 1767544

URL: http://svn.apache.org/viewvc?rev=1767544&view=rev
Log:
Change output filename format.
Fix charset and resource filtering in Windows installer. Only NSIS 2.5 currently works.


Modified:
    directory/studio/trunk/installers/windows/pom.xml
    directory/studio/trunk/installers/windows/src/nsis/AdvUninstLog.nsh
    directory/studio/trunk/installers/windows/src/nsis/windows_installer.nsi

Modified: directory/studio/trunk/installers/windows/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/installers/windows/pom.xml?rev=1767544&r1=1767543&r2=1767544&view=diff
==============================================================================
--- directory/studio/trunk/installers/windows/pom.xml (original)
+++ directory/studio/trunk/installers/windows/pom.xml Tue Nov  1 18:33:26 2016
@@ -62,6 +62,10 @@
               <targetPath>${basedir}/target/release</targetPath>
             </resource>
           </resources>
+          <!-- Disable default escape string since maven-resources-plugin 3.0.0, would destroy NSIS variables in windows_installer.nsi -->
+          <escapeString>XXX</escapeString>
+          <!-- Set encoding to ISO-8859/CP1252 -->
+          <encoding>ISO-8859-1</encoding>
         </configuration>
       </plugin>
 
@@ -75,6 +79,9 @@
           <arguments>
             <argument>windows_installer.nsi</argument>
           </arguments>
+          <environmentVariables>
+            <LANG>en_US.ISO-8859-1</LANG>
+          </environmentVariables>
         </configuration>
       </plugin>
     </plugins>

Modified: directory/studio/trunk/installers/windows/src/nsis/AdvUninstLog.nsh
URL: http://svn.apache.org/viewvc/directory/studio/trunk/installers/windows/src/nsis/AdvUninstLog.nsh?rev=1767544&r1=1767543&r2=1767544&view=diff
==============================================================================
--- directory/studio/trunk/installers/windows/src/nsis/AdvUninstLog.nsh (original)
+++ directory/studio/trunk/installers/windows/src/nsis/AdvUninstLog.nsh Tue Nov  1 18:33:26 2016
@@ -425,7 +425,7 @@
         ${uninstall.log_install} "${UNLOG_PART}${ID}" "${EXCLU_LIST}" "$OUTDIR"
         ${uninstall.log_mergeID} "${UNLOG_PART}${ID}"
 
-   !undef ID ${__LINE__}
+   !undef ID
 
   !verbose pop
 !macroend

Modified: directory/studio/trunk/installers/windows/src/nsis/windows_installer.nsi
URL: http://svn.apache.org/viewvc/directory/studio/trunk/installers/windows/src/nsis/windows_installer.nsi?rev=1767544&r1=1767543&r2=1767544&view=diff
==============================================================================
--- directory/studio/trunk/installers/windows/src/nsis/windows_installer.nsi (original)
+++ directory/studio/trunk/installers/windows/src/nsis/windows_installer.nsi Tue Nov  1 18:33:26 2016
@@ -27,7 +27,7 @@
     !define Icon "img\studio-installer.ico"
     !define WelcomeImage "img\welcome_studio.bmp"
     !define HeaderImage "img\header_studio.bmp"
-    !define OutFile "ApacheDirectoryStudio-win32-${architecture}-${version}.exe"
+    !define OutFile "ApacheDirectoryStudio-${version}-win32.win32.${architecture}.exe"
     !define SourceFolder "release"
     !define INSTDIR_REG_ROOT "HKLM"
     !define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Application}"
@@ -133,8 +133,8 @@
 #
     # Internationalized strings
     LangString message ${LANG_ENGLISH} "${Application} is already installed.$\n$\nClick 'OK' to remove the previous version$\nor 'Cancel' to cancel this installation."
-    LangString message ${LANG_FRENCH} "${Application} est d�j� install�.$\n$\nCliquez sur 'OK' pour supprimer la version pr�c�dente$\nou sur 'Annuler' pour annuler cette installation."
-    LangString message ${LANG_GERMAN} "${Application} ist bereits installiert.$\n$\nKlicke 'OK' um die fr�here Version zu entfernen$\noder 'Abbruch' um die Installation abzubrechen."
+    LangString message ${LANG_FRENCH} "${Application} est d�j� install�.$\n$\nCliquez sur 'OK' pour supprimer la version pr�c�dente$\nou sur 'Annuler' pour annuler cette installation."
+    LangString message ${LANG_GERMAN} "${Application} ist bereits installiert.$\n$\nKlicke 'OK' um die fr�here Version zu entfernen$\noder 'Abbruch' um die Installation abzubrechen."
 
     # onInit function
     Function .onInit