directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1753811 - in /directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer: AdvUninstLog.nsh README generate-32bit.sh generate-64bit.sh utils/AdvUninstLog.nsh windows_installer.nsi
Date Fri, 22 Jul 2016 16:46:24 GMT
Author: kayyagari
Date: Fri Jul 22 16:46:24 2016
New Revision: 1753811

URL: http://svn.apache.org/viewvc?rev=1753811&view=rev
Log:
o added shell scripts to generate 32 and 64 bit installers
o updated readme
o moved the AdvUninstLog.sh file to parent folder (this is where it is expected by the .nsi
scrip)
o removed an additional argument passed to DeleteRegKey

Added:
    directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/AdvUninstLog.nsh
      - copied unchanged from r1753758, directory/studio/tags/2.0.0.v20160717-M11/tools/Windows
Installer/utils/AdvUninstLog.nsh
    directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-32bit.sh  
(with props)
    directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-64bit.sh  
(with props)
Removed:
    directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/utils/AdvUninstLog.nsh
Modified:
    directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/README
    directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/windows_installer.nsi

Modified: directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/README
URL: http://svn.apache.org/viewvc/directory/studio/tags/2.0.0.v20160717-M11/tools/Windows%20Installer/README?rev=1753811&r1=1753810&r2=1753811&view=diff
==============================================================================
--- directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/README (original)
+++ directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/README Fri Jul 22 16:46:24
2016
@@ -1,11 +1,9 @@
 The windows_install.nsi script creates the Windows installer for a release of Apache Directory
Studio on Windows.
 
-To create a Windows installer, you have to put in a "release" folder the following files:
-  * Apache Directory Studio.exe (the application)
-  * LICENSE.txt
-  * NOTICE.txt
-  * Release Notes.txt
+To create a Windows installer, 
 
-Then, you can compile the script with NSIS.
+1. set the environment variable STUDIO_VERSION with the desired version number
 
-An "Apache_Directory_Studio_VERSION_Windows.exe" installer will be generated.
\ No newline at end of file
+2. Run the generate-32bit.sh and generate-64bit.sh files to generate installers for 32bit
and 64bit OS versions respectively.
+
+"Apache_Directory_Studio_VERSION_Windows.exe" installer(s) will be generated.

Added: directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-32bit.sh
URL: http://svn.apache.org/viewvc/directory/studio/tags/2.0.0.v20160717-M11/tools/Windows%20Installer/generate-32bit.sh?rev=1753811&view=auto
==============================================================================
--- directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-32bit.sh (added)
+++ directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-32bit.sh Fri
Jul 22 16:46:24 2016
@@ -0,0 +1,20 @@
+#Generates an installer that is compatible with Windows 32bit version 
+if [ -z "$STUDIO_VERSION" ]; then
+   echo "Please set the STUDIO_VERSION environment variable to generate the installer"
+   exit 1
+fi
+
+PROD_NAME=ApacheDirectoryStudio
+FILE_NAME=$PROD_NAME*-win32.win32.x86.zip
+rm -rf release
+unzip ../../product/target/products/$FILE_NAME
+mv $PROD_NAME release
+mv release/LICENSE release/LICENSE.txt
+
+#set LANG to C to avoid "sed: RE error: illegal byte sequence" error
+export LANG=C
+
+sed -e "s/STUDIO_VERSION/x86-$STUDIO_VERSION/" windows_installer.nsi > temp_win_installer.nsi
+sed -i.bak "s/BRANDING_VERSION/$STUDIO_VERSION/" temp_win_installer.nsi
+
+makensis temp_win_installer.nsi

Propchange: directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-32bit.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-64bit.sh
URL: http://svn.apache.org/viewvc/directory/studio/tags/2.0.0.v20160717-M11/tools/Windows%20Installer/generate-64bit.sh?rev=1753811&view=auto
==============================================================================
--- directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-64bit.sh (added)
+++ directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-64bit.sh Fri
Jul 22 16:46:24 2016
@@ -0,0 +1,20 @@
+#Generates an installer that is compatible with Windows 64bit version 
+if [ -z "$STUDIO_VERSION" ]; then
+   echo "Please set the STUDIO_VERSION environment variable to generate the installer"
+   exit 1
+fi
+
+PROD_NAME=ApacheDirectoryStudio
+FILE_NAME=$PROD_NAME*-win32.win32.x86_64.zip
+rm -rf release
+unzip ../../product/target/products/$FILE_NAME
+mv $PROD_NAME release
+mv release/LICENSE release/LICENSE.txt
+
+#set LANG to C to avoid "sed: RE error: illegal byte sequence" error
+export LANG=C
+
+sed -e "s/STUDIO_VERSION/x86_64-$STUDIO_VERSION/" windows_installer.nsi > temp_win_installer.nsi
+sed -i.bak "s/BRANDING_VERSION/$STUDIO_VERSION/" temp_win_installer.nsi
+
+makensis temp_win_installer.nsi

Propchange: directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/generate-64bit.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/windows_installer.nsi
URL: http://svn.apache.org/viewvc/directory/studio/tags/2.0.0.v20160717-M11/tools/Windows%20Installer/windows_installer.nsi?rev=1753811&r1=1753810&r2=1753811&view=diff
==============================================================================
--- directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/windows_installer.nsi
(original)
+++ directory/studio/tags/2.0.0.v20160717-M11/tools/Windows Installer/windows_installer.nsi
Fri Jul 22 16:46:24 2016
@@ -21,7 +21,8 @@
 # Constants and variables
 #
     !define Application "Apache Directory Studio"
-    !define Version "1.4.0.v20090407"
+    !define Version "STUDIO_VERSION"
+    !define BrandingVersion "BRANDING_VERSION"
     !define Icon "utils\studio-installer.ico"
     !define WelcomeImage "utils\welcome_studio.bmp"
     !define HeaderImage "utils\header_studio.bmp"
@@ -52,7 +53,7 @@
     InstallDir "$PROGRAMFILES\${Application}"
     
     # Branding text
-    BrandingText "${Application} - ${Version}"
+    BrandingText "${Application} - ${BrandingVersion}"
 
     # Activating XPStyle
     XPStyle on
@@ -229,5 +230,5 @@
         
         # Removing registry keys
         DeleteRegKey "${INSTDIR_REG_ROOT}" "${INSTDIR_REG_KEY}"
-        DeleteRegKey "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir"
+        DeleteRegKey "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}"
     SectionEnd



Mime
View raw message