1. mirror
  2. Apache Directory Studio

Commits

Pierre-Arnaud Marcelot  committed 7cebc95

Removed the 'application-unpack' module. Excluded the help plugins and features modules from the 'normal' build and introduced a special 'studio-full' profile for them.

git-svn-id: https://svn.apache.org/repos/asf/directory/studio/branches/studio-improved-build@95486513f79535-47bb-0310-9956-ffa450edef68

  • Participants
  • Parent commits 27e314e
  • Branches studio-improved-build

Comments (0)

Files changed (11)

File application/application-linux-x86/pom.xml

View file
     <app-dir>${studio-dir}-linux-x86</app-dir>
     <plugins-dir>${app-dir}/plugins</plugins-dir>
     <features-dir>${app-dir}/features</features-dir>
+    <configuration-dir>${app-dir}/configuration</configuration-dir>
   </properties>
   
   <build>
                 <copy todir="${features-dir}">
                   <fileset dir="${project.build.directory}/application-features-${project.version}" />
                 </copy>
+                <copy todir="${configuration-dir}" file="src/main/configuration/config.ini" />
+                <copy todir="${app-dir}" file="../../docs/LICENSE.txt" />
+                <copy todir="${app-dir}" file="../../docs/NOTICE.txt" />
+                <copy todir="${app-dir}" file="../../docs/Release Notes.txt" />
+                <chmod file="${app-dir}/ApacheDirectoryStudio" perm="755"/>
               </tasks>
             </configuration>
             <goals>

File application/application-linux-x86/src/main/assembly/application.xml

View file
             </includes>
             <fileMode>755</fileMode>
         </fileSet>
-
-        <!-- Configuration file -->
-        <fileSet>
-            <directory>src/main/configuration</directory>
-            <outputDirectory>/configuration</outputDirectory>
-            <includes>
-                <include>config.ini</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        
-        <!-- Legal files & release notes -->
-        <fileSet>
-            <directory>../../docs</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-                <include>Release Notes.txt</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
     </fileSets>
 </assembly>

File application/application-linux-x86_64/pom.xml

View file
     <app-dir>${studio-dir}-linux-x86_64</app-dir>
     <plugins-dir>${app-dir}/plugins</plugins-dir>
     <features-dir>${app-dir}/features</features-dir>
+    <configuration-dir>${app-dir}/configuration</configuration-dir>
   </properties>
   
   <build>
                 <copy todir="${features-dir}">
                   <fileset dir="${project.build.directory}/application-features-${project.version}" />
                 </copy>
+                <copy todir="${configuration-dir}" file="src/main/configuration/config.ini" />
+                <copy todir="${app-dir}" file="../../docs/LICENSE.txt" />
+                <copy todir="${app-dir}" file="../../docs/NOTICE.txt" />
+                <copy todir="${app-dir}" file="../../docs/Release Notes.txt" />
+                <chmod file="${app-dir}/ApacheDirectoryStudio" perm="755"/>
               </tasks>
             </configuration>
             <goals>

File application/application-linux-x86_64/src/main/assembly/application.xml

View file
             </includes>
             <fileMode>755</fileMode>
         </fileSet>
-
-        <!-- Configuration file -->
-        <fileSet>
-            <directory>src/main/configuration</directory>
-            <outputDirectory>/configuration</outputDirectory>
-            <includes>
-                <include>config.ini</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        
-        <!-- Legal files & release notes -->
-        <fileSet>
-            <directory>../../docs</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-                <include>Release Notes.txt</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
     </fileSets>
 </assembly>
 

File application/application-macosx/pom.xml

View file
     <app-dir>${studio-dir}-macosx</app-dir>
     <plugins-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/plugins</plugins-dir>
     <features-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/features</features-dir>
+    <configuration-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/configuration</configuration-dir>
   </properties>
   
   <build>
                 <copy todir="${features-dir}">
                   <fileset dir="${project.build.directory}/application-features-${project.version}" />
                 </copy>
+                <copy todir="${configuration-dir}" file="src/main/configuration/config.ini" />
+                <copy todir="${app-dir}" file="../../docs/LICENSE.txt" />
+                <copy todir="${app-dir}" file="../../docs/NOTICE.txt" />
+                <copy todir="${app-dir}" file="../../docs/Release Notes.txt" />
+                <chmod file="${app-dir}/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755"/>
               </tasks>
             </configuration>
             <goals>

File application/application-macosx/src/main/assembly/application.xml

View file
             </includes>
             <fileMode>755</fileMode>
         </fileSet>
-        
-        <!-- Configuration file -->
-        <fileSet>
-            <directory>src/main/configuration</directory>
-            <outputDirectory>/Apache Directory Studio.app/Contents/Resources/Java/configuration</outputDirectory>
-            <includes>
-                <include>config.ini</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        
-        <!-- Legal files & release notes -->
-        <fileSet>
-            <directory>../../docs</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-                <include>Release Notes.txt</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
     </fileSets>
 </assembly>

File application/application-unpack/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!--
-  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.directory.studio</groupId>
-    <artifactId>application</artifactId>
-    <version>1.5.4-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>application-unpack</artifactId>
-  <name>Apache Directory Studio Application Unpack</name>
-  <packaging>pom</packaging>
-  
-  <properties>
-    <distributions-dir>../../target/distributions/</distributions-dir>
-  </properties>
-  
-  <profiles>
-    <profile>
-      <id>linux-x86</id>
-      <activation>
-        <os>
-          <arch>i386</arch>
-          <family>unix</family>
-          <name>linux</name>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-dist-linux-x86 (for immediate use)</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${distributions-dir}</outputDirectory>
-                  <overWrite>true</overWrite>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.apache.directory.studio</groupId>
-                      <artifactId>ApacheDirectoryStudio-linux-x86</artifactId>
-                      <version>${project.version}</version> <!-- TODO -->
-                      <type>tar.gz</type>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>linux-x86_64</id>
-      <activation>
-        <os>
-          <arch>amd64</arch>
-          <family>unix</family>
-          <name>linux</name>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-dist-linux-x86_64 (for immediate use)</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${distributions-dir}</outputDirectory>
-                  <overWrite>true</overWrite>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.apache.directory.studio</groupId>
-                      <artifactId>ApacheDirectoryStudio-linux-x86_64</artifactId>
-                      <version>${project.version}</version> <!-- TODO -->
-                      <type>tar.gz</type>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>win32</id>
-      <activation>
-        <os>
-          <arch>x86</arch>
-          <family>windows</family>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-dist-win32 (for immediate use)</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${distributions-dir}</outputDirectory>
-                  <overWrite>true</overWrite>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.apache.directory.studio</groupId>
-                      <artifactId>ApacheDirectoryStudio-win32</artifactId>
-                      <version>${project.version}</version> <!-- TODO -->
-                      <type>zip</type>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>macosx</id>
-      <activation>
-        <os>
-          <family>unix</family>
-          <name>mac os x</name>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-dist-macosx (for immediate use)</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${distributions-dir}</outputDirectory>
-                  <overWrite>true</overWrite>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.apache.directory.studio</groupId>
-                      <artifactId>ApacheDirectoryStudio-macosx</artifactId>
-                      <version>${project.version}</version> <!-- TODO -->
-                      <type>zip</type>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  
-</project>

File application/application-win32/pom.xml

View file
     <app-dir>${studio-dir}-win32</app-dir>
     <plugins-dir>${app-dir}/plugins</plugins-dir>
     <features-dir>${app-dir}/features</features-dir>
+    <configuration-dir>${app-dir}/configuration</configuration-dir>
   </properties>
   
   <build>
                 <copy todir="${features-dir}">
                   <fileset dir="${project.build.directory}/application-features-${project.version}" />
                 </copy>
+                <copy todir="${configuration-dir}" file="src/main/configuration/config.ini" />
+                <copy todir="${app-dir}" file="../../docs/LICENSE.txt" />
+                <copy todir="${app-dir}" file="../../docs/NOTICE.txt" />
+                <copy todir="${app-dir}" file="../../docs/Release Notes.txt" />
+                <chmod file="${app-dir}/Apache Directory Studio.exe" perm="755"/>
               </tasks>
             </configuration>
             <goals>

File application/application-win32/src/main/assembly/application.xml

View file
             </includes>
             <fileMode>755</fileMode>
         </fileSet>
-        
-        <!-- Configuration file -->
-        <fileSet>
-            <directory>src/main/configuration</directory>
-            <outputDirectory>/configuration</outputDirectory>
-            <includes>
-                <include>config.ini</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        
-        <!-- Legal files & release notes -->
-        <fileSet>
-            <directory>../../docs</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-                <include>Release Notes.txt</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
     </fileSets>
 </assembly>

File application/pom.xml

View file
       </modules>
     </profile>
     <profile>
-      <id>unpack</id>
-      <activation>
-        <file>
-          <exists>pom.xml</exists>
-        </file>
-      </activation>
-      <modules>
-        <module>application-unpack</module>
-      </modules>
-    </profile>
-    <profile>
       <id>release</id>
       <modules>
         <module>application-macosx-dmg</module>

File pom.xml

View file
       to the commandline.
     -->
     <profile>
-      <id>build-help-modules</id>
-      <activation>
-        <property>
-          <name>!fastbuild</name>
-        </property>
-      </activation>
+      <id>studio-full</id>
       <modules>
         <module>schemaeditor-help</module>
         <module>ldifeditor-help</module>
         <module>apacheds-configuration-help</module>
         <module>rcp-help</module>
         <module>apacheds-help</module>
+        <module>apacheds-configuration-feature</module>
+        <module>apacheds-feature</module>
+        <module>ldapbrowser-feature</module>
+        <module>ldifeditor-feature</module>
+        <module>rcp-feature</module>
+        <module>schemaeditor-feature</module>
       </modules>
     </profile>
     <!-- 
     <module>aciitemeditor</module>
     <module>apacheds</module>
     <module>apacheds-configuration</module>
-    <module>apacheds-configuration-feature</module>
     <module>apacheds-launcher</module>
-    <module>apacheds-feature</module>
     <module>connection-core</module>
     <module>connection-ui</module>
     <module>common-ui</module>
     <module>jars</module>
     <module>ldapbrowser-core</module>
     <module>ldapbrowser-common</module>
-    <module>ldapbrowser-feature</module>
     <module>ldapbrowser-ui</module>
     <module>ldifeditor</module>
-    <module>ldifeditor-feature</module>
     <module>ldif-parser</module>
     <module>rcp</module>
-    <module>rcp-feature</module>
     <module>schemaeditor</module>
-    <module>schemaeditor-feature</module>
     <module>valueeditors</module>
   </modules>