directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r530774 - in /directory/ldapstudio/trunk: build.xml ldapstudio-apacheds-configuration/build.xml ldapstudio-browser-core/build.xml
Date Fri, 20 Apr 2007 12:40:45 GMT
Author: pamarcelot
Date: Fri Apr 20 05:40:43 2007
New Revision: 530774

URL: http://svn.apache.org/viewvc?view=rev&rev=530774
Log:
Fixing the build (it was failing because of unresolved dependencies that are located in the
ldapstudio-jars plugin).

Modified:
    directory/ldapstudio/trunk/build.xml
    directory/ldapstudio/trunk/ldapstudio-apacheds-configuration/build.xml
    directory/ldapstudio/trunk/ldapstudio-browser-core/build.xml

Modified: directory/ldapstudio/trunk/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/build.xml?view=diff&rev=530774&r1=530773&r2=530774
==============================================================================
--- directory/ldapstudio/trunk/build.xml (original)
+++ directory/ldapstudio/trunk/build.xml Fri Apr 20 05:40:43 2007
@@ -185,6 +185,24 @@
             </fileset>
         </copy>
 
+        <!-- Creation of the Apache DS Configuration Plugin -->
+        <ant dir="ldapstudio-apacheds-configuration" inheritAll="no" />
+        <!-- Copy of the Jars Plugin in the "plugins" folder of the RCP app -->
+        <copy todir="${ldapstudio-complete.build}/plugins">
+            <fileset dir="${basedir}/ldapstudio-apacheds-configuration/target">
+                <include name="*.jar" />
+            </fileset>
+        </copy>
+
+        <!-- Creation of the Apache DS Configuration Help Plugin -->
+        <ant dir="ldapstudio-apacheds-configuration-help" inheritAll="no" />
+        <!-- Copy of the Jars Plugin in the "plugins" folder of the RCP app -->
+        <copy todir="${ldapstudio-complete.build}/plugins">
+            <fileset dir="${basedir}/ldapstudio-apacheds-configuration-help/target">
+                <include name="*.jar" />
+            </fileset>
+        </copy>
+
         <!-- Property for the features -->
 		<property name="project.features" value="${ldapstudio-complete.build}/features" />
 
@@ -227,6 +245,19 @@
 			</fileset>
 		</copy>
 
+        <!-- Copy of the Apache DS Configuration Feature in the "features" folder -->
+		<property name="ldapstudio-apacheds-configuration-feature.project" value="${basedir}/ldapstudio-apacheds-configuration-feature"
/>
+		<property name="ldapstudio-apacheds-configuration-feature.name" value="org.apache.directory.ldapstudio.apacheds.configuration.feature"
/>
+		<property name="ldapstudio-apacheds-configuration-feature.version" value="0.8.0" />
+		<mkdir dir="${project.features}/${ldapstudio-apacheds-configuration-feature.name}_${ldapstudio-apacheds-configuration-feature.version}"
/>
+		<copy todir="${project.features}/${ldapstudio-apacheds-configuration-feature.name}_${ldapstudio-apacheds-configuration-feature.version}">
+			<fileset dir="${ldapstudio-apacheds-configuration-feature.project}">
+				<include name="feature.xml" />
+				<include name="ldapstudio.png" />
+				<include name="META-INF/**" />
+			</fileset>
+		</copy>
+
         <!-- Setting Permissions -->
         <antcall target="setPermission_${ldapstudio-rcp.os.name}" />
         
@@ -341,6 +372,8 @@
         <ant dir="ldapstudio-valueeditors" inheritAll="no" target="resolve" />
         <ant dir="ldapstudio-aciitemeditor" inheritAll="no" target="resolve" />
         <ant dir="ldapstudio-jars" inheritAll="no" target="resolve" />
+        <ant dir="ldapstudio-apacheds-configuration" inheritAll="no" target="resolve"
/>
+        <ant dir="ldapstudio-apacheds-configuration-help" inheritAll="no" target="resolve"
/>
     </target>
 
     <!-- ================================== -->
@@ -362,6 +395,8 @@
         <ant dir="ldapstudio-valueeditors" inheritAll="no" target="clean" />
         <ant dir="ldapstudio-aciitemeditor" inheritAll="no" target="clean" />
         <ant dir="ldapstudio-jars" inheritAll="no" target="clean" />
+        <ant dir="ldapstudio-apacheds-configuration" inheritAll="no" target="clean" />
+        <ant dir="ldapstudio-apacheds-configuration-help" inheritAll="no" target="clean"
/>
         <ant dir="ldapstudio-updatesite" inheritAll="no" target="clean" />
         <delete dir="${ldapstudio-complete.output}" />
     </target>

Modified: directory/ldapstudio/trunk/ldapstudio-apacheds-configuration/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-apacheds-configuration/build.xml?view=diff&rev=530774&r1=530773&r2=530774
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-apacheds-configuration/build.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-apacheds-configuration/build.xml Fri Apr 20 05:40:43
2007
@@ -35,7 +35,9 @@
 	<!--               RESOLVE              -->
 	<!-- ================================== -->
 	<target name="resolve" description="retrieve dependencies with ivy">
+		<mkdir dir="${basedir}/${lib.dir}" />
 		<ivy:retrieve/>
+        <ant dir="../ldapstudio-jars" inheritAll="no" target="resolve" />
 	</target>
 
 	<!-- ================================== -->
@@ -47,6 +49,7 @@
 				<include name="**/*.jar"/>
 			</fileset>
 			<fileset dir="${lib.dir}" />
+			<fileset dir="../ldapstudio-jars/lib/" />
 		</path>
 	</target>
 

Modified: directory/ldapstudio/trunk/ldapstudio-browser-core/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-browser-core/build.xml?view=diff&rev=530774&r1=530773&r2=530774
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-browser-core/build.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-browser-core/build.xml Fri Apr 20 05:40:43 2007
@@ -35,7 +35,8 @@
 	<!--               RESOLVE              -->
 	<!-- ================================== -->
 	<target name="resolve" description="--> retreive dependencies with ivy">
-		<ivy:retrieve/>
+		<ivy:retrieve/>
+        <ant dir="../ldapstudio-jars" inheritAll="no" target="resolve" />
 	</target>
 
 	<!-- ================================== -->
@@ -47,6 +48,7 @@
 				<include name="**/*.jar"/>
 			</fileset>
 			<fileset dir="${lib.dir}" />
+			<fileset dir="../ldapstudio-jars/lib/" />
 		</path>
 	</target>
 



Mime
View raw message