directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1056356 - in /directory/studio/trunk/application: application-release/pom.xml application-win32-x86-exe/src/main/resources/installer.nsi application-win32-x86_64-exe/src/main/resources/installer.nsi
Date Fri, 07 Jan 2011 15:32:44 GMT
Author: pamarcelot
Date: Fri Jan  7 15:32:44 2011
New Revision: 1056356

URL: http://svn.apache.org/viewvc?rev=1056356&view=rev
Log:
Part of a fix for DIRSTUDIO-718 (Update Eclipse dependencies to version 3.6.1).
Fixed the generation of the Windows installers and the 'release' module.

Modified:
    directory/studio/trunk/application/application-release/pom.xml
    directory/studio/trunk/application/application-win32-x86-exe/src/main/resources/installer.nsi
    directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi

Modified: directory/studio/trunk/application/application-release/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-release/pom.xml?rev=1056356&r1=1056355&r2=1056356&view=diff
==============================================================================
--- directory/studio/trunk/application/application-release/pom.xml (original)
+++ directory/studio/trunk/application/application-release/pom.xml Fri Jan  7 15:32:44 2011
@@ -63,14 +63,28 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>ApacheDirectoryStudio-macosx-dmg</artifactId>
+                  <artifactId>ApacheDirectoryStudio-macosx-x86-dmg</artifactId>
                   <type>zip</type>
                   <version>${project.version}</version> <!-- TODO -->
                   <outputDirectory>${project.build.directory}</outputDirectory>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>ApacheDirectoryStudio-win32-exe</artifactId>
+                  <artifactId>ApacheDirectoryStudio-macosx-x86_64-dmg</artifactId>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>ApacheDirectoryStudio-win32-x86-exe</artifactId>
+                  <type>zip</type>
+                  <version>${project.version}</version> <!-- TODO -->
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>ApacheDirectoryStudio-win32-x86_64-exe</artifactId>
                   <type>zip</type>
                   <version>${project.version}</version> <!-- TODO -->
                   <outputDirectory>${project.build.directory}</outputDirectory>
@@ -108,8 +122,10 @@
                 <unzip dest="${project.build.directory}">
                     <fileset dir="${project.build.directory}" includes="ApacheDirectoryStudio-*.zip"/>
                 </unzip>
-                <copy file="${project.build.directory}/ApacheDirectoryStudio-macosx-dmg-${version}/ApacheDirectoryStudio-macosx-${version}.dmg"
todir="${release-dir}" />
-                <copy file="${project.build.directory}/ApacheDirectoryStudio-win32-exe-${version}/ApacheDirectoryStudio-win32-${version}.exe"
todir="${release-dir}" />
+                <copy file="${project.build.directory}/ApacheDirectoryStudio-macosx-x86-dmg-${version}/ApacheDirectoryStudio-macosx-x86-${version}.dmg"
todir="${release-dir}" />
+                <copy file="${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-dmg-${version}/ApacheDirectoryStudio-macosx-x86_64-${version}.dmg"
todir="${release-dir}" />
+                <copy file="${project.build.directory}/ApacheDirectoryStudio-win32-x86-exe-${version}/ApacheDirectoryStudio-win32-x86-${version}.exe"
todir="${release-dir}" />
+                <copy file="${project.build.directory}/ApacheDirectoryStudio-win32-x86_64-exe-${version}/ApacheDirectoryStudio-win32-x86_64-${version}.exe"
todir="${release-dir}" />
                 <copy todir="${release-dir}/updatesite">
                   <fileset dir="${project.build.directory}/ApacheDirectoryStudio-updatesite-${version}"/>
                 </copy>

Modified: directory/studio/trunk/application/application-win32-x86-exe/src/main/resources/installer.nsi
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-win32-x86-exe/src/main/resources/installer.nsi?rev=1056356&r1=1056355&r2=1056356&view=diff
==============================================================================
--- directory/studio/trunk/application/application-win32-x86-exe/src/main/resources/installer.nsi
(original)
+++ directory/studio/trunk/application/application-win32-x86-exe/src/main/resources/installer.nsi
Fri Jan  7 15:32:44 2011
@@ -26,7 +26,7 @@
     !define WelcomeImage "welcome_studio.bmp"
     !define HeaderImage "header_studio.bmp"
     !define OutFile "../@installer-file-name@"
-    !define SourceFolder "ApacheDirectoryStudio-win32-${Version}"
+    !define SourceFolder "ApacheDirectoryStudio-win32-x86-${Version}"
     !define INSTDIR_REG_ROOT "HKLM"
     !define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Application}"
 

Modified: directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi?rev=1056356&r1=1056355&r2=1056356&view=diff
==============================================================================
--- directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
(original)
+++ directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
Fri Jan  7 15:32:44 2011
@@ -26,7 +26,7 @@
     !define WelcomeImage "welcome_studio.bmp"
     !define HeaderImage "header_studio.bmp"
     !define OutFile "../@installer-file-name@"
-    !define SourceFolder "ApacheDirectoryStudio-win32-${Version}"
+    !define SourceFolder "ApacheDirectoryStudio-win32-x86_64-${Version}"
     !define INSTDIR_REG_ROOT "HKLM"
     !define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Application}"
 



Mime
View raw message