Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 35784 invoked from network); 9 Feb 2006 06:02:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Feb 2006 06:02:08 -0000 Received: (qmail 43279 invoked by uid 500); 9 Feb 2006 06:02:07 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 43241 invoked by uid 500); 9 Feb 2006 06:02:07 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 43230 invoked by uid 99); 9 Feb 2006 06:02:06 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Feb 2006 22:02:06 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 08 Feb 2006 22:02:06 -0800 Received: (qmail 35647 invoked by uid 65534); 9 Feb 2006 06:01:45 -0000 Message-ID: <20060209060145.35644.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r376197 - in /directory/trunks/daemon/installers-plugin/src/main: java/org/apache/directory/daemon/installers/ java/org/apache/directory/daemon/installers/inno/ resources/org/apache/directory/daemon/installers/inno/ Date: Thu, 09 Feb 2006 06:01:44 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Wed Feb 8 22:01:43 2006 New Revision: 376197 URL: http://svn.apache.org/viewcvs?rev=376197&view=rev Log: added support for inno to include docs Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=376197&r1=376196&r2=376197&view=diff ============================================================================== --- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java (original) +++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java Wed Feb 8 22:01:43 2006 @@ -369,7 +369,7 @@ if ( target.getSourcesDirectory() != null ) { - File sourcesDirectory = new File( layout.getBaseDirectory(), "src" ); + File sourcesDirectory = new File( layout.getBaseDirectory(), target.getSourcesTargetPath() ); try { FileUtils.copyDirectoryStructure( target.getSourcesDirectory(), sourcesDirectory ); @@ -385,7 +385,7 @@ if ( target.getDocsDirectory() != null ) { - File docsDirectory = new File( layout.getBaseDirectory(), "docs" ); + File docsDirectory = new File( layout.getBaseDirectory(), target.getDocsTargetPath() ); try { FileUtils.copyDirectoryStructure( target.getDocsDirectory(), docsDirectory ); Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java?rev=376197&r1=376196&r2=376197&view=diff ============================================================================== --- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java (original) +++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java Wed Feb 8 22:01:43 2006 @@ -40,6 +40,7 @@ import org.apache.maven.project.MavenProject; import org.apache.tools.ant.util.JavaEnvUtils; import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.Os; /** @@ -148,6 +149,16 @@ private boolean packageDocs = false; /** + * @parameter expression="src" + */ + private String sourcesTargetPath; + + /** + * @parameter expression="docs" + */ + private String docsTargetPath; + + /** * @parameter */ private Set excludes; @@ -406,6 +417,16 @@ { target.setDocsDirectory( docsBase ); } + + if ( target.getSourcesTargetPath() == null ) + { + target.setSourcesTargetPath( sourcesTargetPath ); + } + + if ( target.getDocsTargetPath() == null ) + { + target.setDocsTargetPath( docsTargetPath ); + } } } @@ -536,7 +557,15 @@ + exportTarget.getAbsolutePath() + " to " + docsTarget.getAbsolutePath() ); } - String[] cmd = new String[] { "mvn", "site", "--non-recursive" }; + String[] cmd = null; + if ( Os.isFamily( "windows" ) ) + { + cmd = new String[] { "mvn.bat", "site", "--non-recursive" }; + } + else + { + cmd = new String[] { "mvn", "site", "--non-recursive" }; + } MojoHelperUtils.exec( cmd, docsTarget, false ); } Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java?rev=376197&r1=376196&r2=376197&view=diff ============================================================================== --- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java (original) +++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/Target.java Wed Feb 8 22:01:43 2006 @@ -68,6 +68,8 @@ private File bootstrapperConfiguraitonFile; private File sourcesDirectory; private File docsDirectory; + private String sourcesTargetPath; + private String docsTargetPath; private InstallationLayout layout; @@ -283,4 +285,28 @@ { return docsDirectory; } + + + public void setSourcesTargetPath( String sourcesTargetDirectory ) + { + this.sourcesTargetPath = sourcesTargetDirectory; + } + + + public String getSourcesTargetPath() + { + return sourcesTargetPath; + } + + + public void setDocsTargetPath( String docsTargetDirectory ) + { + this.docsTargetPath = docsTargetDirectory; + } + + + public String getDocsTargetPath() + { + return docsTargetPath; + } } Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java?rev=376197&r1=376196&r2=376197&view=diff ============================================================================== --- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java (original) +++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/inno/InnoInstallerCommand.java Wed Feb 8 22:01:43 2006 @@ -245,6 +245,44 @@ filterProperties.put( "image.basedir", target.getLayout().getBaseDirectory().getPath() ); filterProperties.put( "app.lib.jars", getApplicationLibraryJars() ); filterProperties.put( "installer.output.directory", target.getLayout().getBaseDirectory().getParent() ); + + if ( target.getDocsDirectory() != null ) + { + filterProperties.put( "docs.directive", getDocsDirective() ); + } + else + { + filterProperties.put( "docs.directive", "" ); + } + + if ( target.getSourcesDirectory() != null ) + { + filterProperties.put( "sources.directive", getSourcesDirective() ); + } + else + { + filterProperties.put( "sources.directive", "" ); + } + } + + + private String getSourcesDirective() + { + StringBuffer buf = new StringBuffer(); + buf.append( "Source: {#SourceBase}\\" ).append( target.getSourcesTargetPath() ); + buf.append( "\\*; DestDir: {app}\\" ).append( target.getSourcesTargetPath() ); + buf.append( "\\; Flags: ignoreversion recursesubdirs createallsubdirs" ); + return buf.toString(); + } + + + private String getDocsDirective() + { + StringBuffer buf = new StringBuffer(); + buf.append( "Source: {#SourceBase}\\" ).append( target.getDocsTargetPath() ); + buf.append( "\\*; DestDir: {app}\\" ).append( target.getDocsTargetPath() ); + buf.append( "\\; Flags: ignoreversion recursesubdirs createallsubdirs" ); + return buf.toString(); } Modified: directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss?rev=376197&r1=376196&r2=376197&view=diff ============================================================================== --- directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss (original) +++ directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss Wed Feb 8 22:01:43 2006 @@ -63,6 +63,8 @@ Source: {#SourceBase}\lib\ext; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs createallsubdirs ; lib directory targets ${app.lib.jars} +${docs.directive} +${sources.directive} [Icons] Name: {group}\Service Settings; Filename: {app}\bin\${app}w.exe; Parameters: //ES//${app}; IconIndex: 0