directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r954865 - in /directory/studio/branches/studio-improved-build: ./ application/ application/application-linux-x86/ application/application-linux-x86/src/main/assembly/ application/application-linux-x86_64/ application/application-linux-x86_6...
Date Tue, 15 Jun 2010 13:17:36 GMT
Author: pamarcelot
Date: Tue Jun 15 13:17:36 2010
New Revision: 954865

URL: http://svn.apache.org/viewvc?rev=954865&view=rev
Log:
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.

Removed:
    directory/studio/branches/studio-improved-build/application/application-unpack/
Modified:
    directory/studio/branches/studio-improved-build/application/application-linux-x86/pom.xml
    directory/studio/branches/studio-improved-build/application/application-linux-x86/src/main/assembly/application.xml
    directory/studio/branches/studio-improved-build/application/application-linux-x86_64/pom.xml
    directory/studio/branches/studio-improved-build/application/application-linux-x86_64/src/main/assembly/application.xml
    directory/studio/branches/studio-improved-build/application/application-macosx/pom.xml
    directory/studio/branches/studio-improved-build/application/application-macosx/src/main/assembly/application.xml
    directory/studio/branches/studio-improved-build/application/application-win32/pom.xml
    directory/studio/branches/studio-improved-build/application/application-win32/src/main/assembly/application.xml
    directory/studio/branches/studio-improved-build/application/pom.xml
    directory/studio/branches/studio-improved-build/pom.xml

Modified: directory/studio/branches/studio-improved-build/application/application-linux-x86/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-linux-x86/pom.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-linux-x86/pom.xml
(original)
+++ directory/studio/branches/studio-improved-build/application/application-linux-x86/pom.xml
Tue Jun 15 13:17:36 2010
@@ -34,6 +34,7 @@
     <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>
@@ -125,6 +126,11 @@
                 <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>

Modified: directory/studio/branches/studio-improved-build/application/application-linux-x86/src/main/assembly/application.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-linux-x86/src/main/assembly/application.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-linux-x86/src/main/assembly/application.xml
(original)
+++ directory/studio/branches/studio-improved-build/application/application-linux-x86/src/main/assembly/application.xml
Tue Jun 15 13:17:36 2010
@@ -43,27 +43,5 @@
             </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>

Modified: directory/studio/branches/studio-improved-build/application/application-linux-x86_64/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-linux-x86_64/pom.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-linux-x86_64/pom.xml
(original)
+++ directory/studio/branches/studio-improved-build/application/application-linux-x86_64/pom.xml
Tue Jun 15 13:17:36 2010
@@ -34,6 +34,7 @@
     <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>
@@ -125,6 +126,11 @@
                 <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>

Modified: directory/studio/branches/studio-improved-build/application/application-linux-x86_64/src/main/assembly/application.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-linux-x86_64/src/main/assembly/application.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-linux-x86_64/src/main/assembly/application.xml
(original)
+++ directory/studio/branches/studio-improved-build/application/application-linux-x86_64/src/main/assembly/application.xml
Tue Jun 15 13:17:36 2010
@@ -40,28 +40,6 @@
             </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>
 

Modified: directory/studio/branches/studio-improved-build/application/application-macosx/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-macosx/pom.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-macosx/pom.xml
(original)
+++ directory/studio/branches/studio-improved-build/application/application-macosx/pom.xml
Tue Jun 15 13:17:36 2010
@@ -34,6 +34,7 @@
     <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>
@@ -125,6 +126,11 @@
                 <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>

Modified: directory/studio/branches/studio-improved-build/application/application-macosx/src/main/assembly/application.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-macosx/src/main/assembly/application.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-macosx/src/main/assembly/application.xml
(original)
+++ directory/studio/branches/studio-improved-build/application/application-macosx/src/main/assembly/application.xml
Tue Jun 15 13:17:36 2010
@@ -41,27 +41,5 @@
             </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>

Modified: directory/studio/branches/studio-improved-build/application/application-win32/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-win32/pom.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-win32/pom.xml
(original)
+++ directory/studio/branches/studio-improved-build/application/application-win32/pom.xml
Tue Jun 15 13:17:36 2010
@@ -34,6 +34,7 @@
     <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>
@@ -125,6 +126,11 @@
                 <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>

Modified: directory/studio/branches/studio-improved-build/application/application-win32/src/main/assembly/application.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/application-win32/src/main/assembly/application.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/application/application-win32/src/main/assembly/application.xml
(original)
+++ directory/studio/branches/studio-improved-build/application/application-win32/src/main/assembly/application.xml
Tue Jun 15 13:17:36 2010
@@ -41,27 +41,5 @@
             </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>

Modified: directory/studio/branches/studio-improved-build/application/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/application/pom.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/application/pom.xml (original)
+++ directory/studio/branches/studio-improved-build/application/pom.xml Tue Jun 15 13:17:36
2010
@@ -98,17 +98,6 @@
       </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>

Modified: directory/studio/branches/studio-improved-build/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-improved-build/pom.xml?rev=954865&r1=954864&r2=954865&view=diff
==============================================================================
--- directory/studio/branches/studio-improved-build/pom.xml (original)
+++ directory/studio/branches/studio-improved-build/pom.xml Tue Jun 15 13:17:36 2010
@@ -111,12 +111,7 @@
       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>
@@ -124,6 +119,12 @@
         <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>
     <!-- 
@@ -1138,24 +1139,18 @@
     <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>
 



Mime
View raw message