directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r373027 - in /directory/trunks/apacheds/standalone/installers/plugin/src/main: java/org/apache/directory/server/standalone/installers/ java/org/apache/directory/server/standalone/installers/inno/ resources/org/apache/directory/server/standa...
Date Fri, 27 Jan 2006 23:23:35 GMT
Author: akarasulu
Date: Fri Jan 27 15:23:30 2006
New Revision: 373027

URL: http://svn.apache.org/viewcvs?rev=373027&view=rev
Log:
making inno install add -VERSION to installation folder

Modified:
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java?rev=373027&r1=373026&r2=373027&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
Fri Jan 27 15:23:30 2006
@@ -112,8 +112,7 @@
     private String applicationClass;
 
     /**
-     * @parameter 
-     * @required
+     * @parameter expression="${project.version}"
      */
     private String applicationVersion;
 

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java?rev=373027&r1=373026&r2=373027&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/inno/InnoInstallerCommand.java
Fri Jan 27 15:23:30 2006
@@ -239,7 +239,7 @@
             buf.append( "Source: {#SourceBase}\\lib\\" );
             File artifact = ( ( Artifact ) artifacts.get( ii ) ).getFile();
             buf.append( artifact.getName() );
-            buf.append( "; DestDir: {app}\\lib; DestName: " );
+            buf.append( "; DestDir: {app}-${app.version}\\lib; DestName: " );
             buf.append( artifact.getName() );
             buf.append( "\n" );
         }

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss?rev=373027&r1=373026&r2=373027&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/inno/install.iss
Fri Jan 27 15:23:30 2006
@@ -43,36 +43,36 @@
 
 [Files]
 ; bin directory targets
-Source: {#SourceBase}\bin\${app}w.exe; DestDir: {app}\bin; Tasks: ; Languages: 
-Source: {#SourceBase}\bin\${app}.exe; DestDir: {app}\bin
-Source: {#SourceBase}\bin\bootstrapper.jar; DestDir: {app}\bin; DestName: bootstrapper.jar
-Source: {#SourceBase}\bin\logger.jar; DestDir: {app}\bin; DestName: logger.jar
-Source: {#SourceBase}\bin\daemon.jar; DestDir: {app}\bin; DestName: daemon.jar
+Source: {#SourceBase}\bin\${app}w.exe; DestDir: {app}-${app.version}\bin; Tasks: ; Languages:

+Source: {#SourceBase}\bin\${app}.exe; DestDir: {app}-${app.version}\bin
+Source: {#SourceBase}\bin\bootstrapper.jar; DestDir: {app}-${app.version}\bin; DestName:
bootstrapper.jar
+Source: {#SourceBase}\bin\logger.jar; DestDir: {app}-${app.version}\bin; DestName: logger.jar
+Source: {#SourceBase}\bin\daemon.jar; DestDir: {app}-${app.version}\bin; DestName: daemon.jar
 ; conf directory targets
-Source: {#SourceBase}\conf\log4j.properties; DestDir: {app}\conf; DestName: log4j.properties
-Source: {#SourceBase}\conf\server.xml; DestDir: {app}\conf; DestName: server.xml
-Source: {#SourceBase}\conf\bootstrapper.properties; DestDir: {app}\conf; DestName: bootstrapper.properties
+Source: {#SourceBase}\conf\log4j.properties; DestDir: {app}-${app.version}\conf; DestName:
log4j.properties
+Source: {#SourceBase}\conf\server.xml; DestDir: {app}-${app.version}\conf; DestName: server.xml
+Source: {#SourceBase}\conf\bootstrapper.properties; DestDir: {app}-${app.version}\conf; DestName:
bootstrapper.properties
 ; top level directory targets 
-Source: {#SourceBase}\${app.license.name}; DestDir: {app}; DestName: ${app.license.name}
-Source: {#SourceBase}\${app.readme.name}; DestDir: {app}; DestName: ${app.readme.name}
-Source: {#SourceBase}\${app.icon.name}; DestDir: {app}; DestName: ${app.icon.name}
+Source: {#SourceBase}\${app.license.name}; DestDir: {app}-${app.version}; DestName: ${app.license.name}
+Source: {#SourceBase}\${app.readme.name}; DestDir: {app}-${app.version}; DestName: ${app.readme.name}
+Source: {#SourceBase}\${app.icon.name}; DestDir: {app}-${app.version}; DestName: ${app.icon.name}
 ; empty var & lib\ext directory structure
-Source: {#SourceBase}\var\*; DestDir: "{app}\var\"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: {#SourceBase}\lib\ext; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs
createallsubdirs
+Source: {#SourceBase}\var\*; DestDir: "{app}-${app.version}\var\"; Flags: ignoreversion recursesubdirs
createallsubdirs
+Source: {#SourceBase}\lib\ext; DestDir: "{app}-${app.version}\lib"; Flags: ignoreversion
recursesubdirs createallsubdirs
 ; lib directory targets
 ${app.lib.jars}
 
 [Icons]
-Name: {group}\Service Settings; Filename: {app}\bin\${app}w.exe; Parameters: //ES//${app};
IconIndex: 0
-Name: {userdesktop}\{#MyAppName}; Filename: {app}\bin\${app}w.exe; Tasks: desktopicon; Parameters:
//ES//${app}; IconIndex: 0; Languages: 
-Name: {group}\Tray Monitor; Filename: {app}\bin\${app}w.exe; Parameters: //MS//${app}; IconIndex:
0
-Name: {group}\Test Service; Filename: {app}\bin\${app}.exe; IconIndex: 0
+Name: {group}\Service Settings; Filename: {app}-${app.version}\bin\${app}w.exe; Parameters:
//ES//${app}; IconIndex: 0
+Name: {userdesktop}\{#MyAppName}; Filename: {app}-${app.version}\bin\${app}w.exe; Tasks:
desktopicon; Parameters: //ES//${app}; IconIndex: 0; Languages: 
+Name: {group}\Tray Monitor; Filename: {app}-${app.version}\bin\${app}w.exe; Parameters: //MS//${app};
IconIndex: 0
+Name: {group}\Test Service; Filename: {app}-${app.version}\bin\${app}.exe; IconIndex: 0
 
 [Run]
-Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Tasks: ; Languages: ; Parameters:
"//IS//${app.displayname} --Description=""${app.description} Service ${app.version} - ${app.url}""
--DisplayName=${app.displayname} --Install=""{app}\bin\${app}.exe"" --StartMode=jvm --StopMode=jvm
--StartClass=org.apache.directory.server.standalone.daemon.ProcrunBootstrapper --StartMethod
prunsrvStart --StartParams=""{app}"" --StopClass=org.apache.directory.server.standalone.daemon.ProcrunBootstrapper
--StopMethod prunsrvStop --StopParams=""{app}"" --Startup=manual --JvmOptions=""-D${app}.home={app}""
--Classpath=""{app}\bin\bootstrapper.jar;{app}\conf;{app}\bin\logger.jar;{app}\bin\daemon.jar""
--LogPath=""{app}\var\log"" --LogPrefix=${app}.log --LogLevel=debug --StdOutput=""{app}\var\log\${app}-stdout.log""
--StdError=""{app}\var\log\${app}-stderr.log"""; Flags: runhidden
-Filename: {app}\bin\${app}w.exe; Parameters: //ES//${app.displayname}; WorkingDir: {app}\bin;
Flags: postinstall nowait; Description: Runs the configuration manager for the ${app} windows
service
+Filename: {app}-${app.version}\bin\${app}.exe; WorkingDir: {app}-${app.version}\bin; Tasks:
; Languages: ; Parameters: "//IS//${app.displayname} --Description=""${app.description} Service
${app.version} - ${app.url}"" --DisplayName=${app.displayname} --Install=""{app}-${app.version}\bin\${app}.exe""
--StartMode=jvm --StopMode=jvm --StartClass=org.apache.directory.server.standalone.daemon.ProcrunBootstrapper
--StartMethod prunsrvStart --StartParams=""{app}"" --StopClass=org.apache.directory.server.standalone.daemon.ProcrunBootstrapper
--StopMethod prunsrvStop --StopParams=""{app}"" --Startup=manual --JvmOptions=""-D${app}.home={app}-${app.version}""
--Classpath=""{app}-${app.version}\bin\bootstrapper.jar;{app}-${app.version}\conf;{app}-${app.version}\bin\logger.jar;{app}-${app.version}\bin\daemon.jar""
--LogPath=""{app}-${app.version}\var\log"" --LogPrefix=${app}.log --LogLevel=debug --StdOutput=""{app}-${app.version}\var\log\${app}-stdout.log""
--StdError=""{app}-${app.versi
 on}\var\log\${app}-stderr.log"""; Flags: runhidden
+Filename: {app}-${app.version}\bin\${app}w.exe; Parameters: //ES//${app.displayname}; WorkingDir:
{app}-${app.version}\bin; Flags: postinstall nowait; Description: Runs the configuration manager
for the ${app} windows service
 
 [Registry]
 
 [UninstallRun]
-Filename: {app}\bin\${app}.exe; WorkingDir: {app}\bin; Parameters: //DS//${app.displayname}
+Filename: {app}-${app.version}\bin\${app}.exe; WorkingDir: {app}-${app.version}\bin; Parameters:
//DS//${app.displayname}



Mime
View raw message