directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r546821 - in /directory/studio/trunk/studio-ldapbrowser-ui: build.xml plugin.properties
Date Wed, 13 Jun 2007 11:04:38 GMT
Author: pamarcelot
Date: Wed Jun 13 04:04:38 2007
New Revision: 546821

URL: http://svn.apache.org/viewvc?view=rev&rev=546821
Log:
Updated the Apache Directory Studio LDAP Browser UI Plugin with the new build system.

Modified:
    directory/studio/trunk/studio-ldapbrowser-ui/build.xml
    directory/studio/trunk/studio-ldapbrowser-ui/plugin.properties

Modified: directory/studio/trunk/studio-ldapbrowser-ui/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/build.xml?view=diff&rev=546821&r1=546820&r2=546821
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/build.xml (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/build.xml Wed Jun 13 04:04:38 2007
@@ -16,149 +16,34 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project default="jar" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-	<property name="project.name" value="org.apache.directory.studio.ldapbrowser.ui" />
-	<property name="project.version" value="0.8.0" />
-
-	<property name="project.output" value="${basedir}/target" />
-	<property name="project.build" value="${project.output}/build" />
-	<property name="project.src" value="${basedir}/src/main/java" />
-
-	<property name="lib.dir" value="lib" />
-
-	<property name="repository.dir" location="../dependencies/externals/"/>
-
-	<!-- Configuring Ivy (Needs to be AFTER the $repository.dir declaration) -->
-	<ivy:configure file="../tools/ivyconf.xml"/>
+<project default="plugin">
+	<import file="../studio-build/build.xml"/>
 	
-	<!-- ================================== -->
-	<!--               RESOLVE              -->
-	<!-- ================================== -->
-	<target name="resolve" description="--> retreive dependencies with ivy">
-		<mkdir dir="${basedir}/${lib.dir}" />
-		<ivy:retrieve/>
+	<!-- COMPILE-DEPENDENCIES TASK -->
+	<target name="compile-dependencies" description="Compiles the dependencies of the project"
>
+		<ant dir="../studio-ldapbrowser-core" target="compile" inheritall="false" />
+		<ant dir="../studio-ldapbrowser-common" target="compile" inheritall="false" />
+		<ant dir="../studio-ldifeditor" target="compile" inheritall="false" />
 	</target>
-		
-	<!-- ================================== -->
-	<!--             CLASSPATH              -->
-	<!-- ================================== -->
-	<target name="build-classpath" description="Computes a classpath according to current
OS" >
-		
+	
+	
+	<!-- BUILD-CLASSPATH TASK -->
+	<target name="build-classpath" depends="compile-dependencies" description="Computes the
classpath" >
+		<echo>Building classpath for ${project.name} (${project.id}) version ${project.version}</echo>
 		<path id="classpath">
+			<!-- Project dependencies -->
+			<fileset dir="${lib.dir}" />
+			<!-- Eclipse dependencies -->
 			<fileset dir="../dependencies/eclipse/3.2">
 				<include name="**/*.jar"/>
-			</fileset>
-			<fileset dir="${lib.dir}" />
-			<pathelement location="${basedir}/../studio-ldapbrowser-core/target/classes"/>
-			<pathelement location="${basedir}/../studio-ldapbrowser-core/target/build"/>
-			<pathelement location="${basedir}/../studio-ldapbrowser-common/target/classes"/>
-			<pathelement location="${basedir}/../studio-ldapbrowser-common/target/build"/>
-			<pathelement location="${basedir}/../studio-ldifeditor/target/classes"/>
-			<pathelement location="${basedir}/../studio-ldifeditor/target/build"/>
-	        <pathelement location="target/classes"/>
-		</path>
-				
-	</target>
-	
-	<!-- ================================== -->
-	<!--             COMPILE                -->
-	<!-- ================================== -->
-	<target name="compile" depends="resolve,checkclasses,build-classpath" unless="classes-up2date"
description="Compiles the plugin">
-		
-		<mkdir dir="${project.build}" />
-		<copy todir="${project.build}">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml" />
-				<include name="plugin.properties" />
-				<include name="about.html" />
-			</fileset>
-		</copy>
-		<mkdir dir="${project.build}/${lib.dir}" />
-		<copy todir="${project.build}/${lib.dir}">
-			<fileset dir="${basedir}/${lib.dir}">
-				<include name="*.jar" />
-			</fileset>
-		</copy>		
-		<mkdir dir="${project.build}/META-INF" />
-		<copy todir="${project.build}/META-INF">
-			<fileset dir="${basedir}/META-INF">
-				<include name="**" />
-			</fileset>
-		</copy>
-		<mkdir dir="${project.build}/resources" />
-		<copy todir="${project.build}/resources">
-			<fileset dir="${basedir}/resources">
-				<include name="**" />
 			</fileset>
-		</copy>
-		
-		<copy todir="${project.build}">
-			<fileset dir="${basedir}/src/main/resources">
-				<include name="**" />
-			</fileset>
-		</copy>	
-			
-		<javac
-			source="1.5"
-			debug="yes"
-			srcdir="${project.src}"
-			excludes=""
-			destdir="${project.build}"
-			classpathref="classpath"
-			listfiles="yes" verbose="false" />
-
-		<tstamp>
-			<format pattern="yyyy-MMM-dd, HH:mm 'GMT'Z" property="timestamp" locale="en" />
-		</tstamp>
-		<echo message="${project.name}-${project.version} compiled ${timestamp} by ${user.name}"
file="${project.build}/compile.timestamp" />
-	</target>
-
-	<target name="checkclasses">
-		<uptodate property="classes-up2date" targetfile="${project.build}/compile.timestamp">
-			<srcfiles dir="${project.src}" />
-		</uptodate>
-	</target>
-
-	<!-- ================================== -->
-	<!--              JAVADOC               -->
-	<!-- ================================== -->
-	<target name="javadoc" description="Generate Javadoc files">
-		<mkdir dir="${basedir}/doc" />
-		<javadoc destdir="${basedir}/doc">
-			<fileset dir="src/main/java" defaultexcludes="yes">
-				<include name="org/apache/directory/studio/**/*.java"/>
-			</fileset>
-		</javadoc>
+			<!-- Plugin dependencies -->
+			<fileset dir="../studio-jars/lib/" />
+			<pathelement location="../studio-ldapbrowser-core/target/classes"/>
+			<pathelement location="../studio-ldapbrowser-common/target/classes"/>
+			<pathelement location="../studio-ldifeditor/target/classes"/>
+		</path>
 	</target>
 	
-	<!-- ================================== -->
-	<!--              JAR                   -->
-	<!-- ================================== -->
-	<target name="jar" description="Creates jar file" depends="compile">
-		<jar destfile="${project.output}/${project.name}_${project.version}.jar" manifest="${project.build}/META-INF/MANIFEST.MF">
-			<fileset dir="${project.build}" excludes="compile.timestamp" />
-		</jar>
-	</target>
-
-	<!-- ================================== -->
-	<!--               CLEAN                -->
-	<!-- ================================== -->
-	<target name="clean" description="Deletes any generated file (javadoc, classes, jars,
distribution)">
-		<delete includeemptydirs="true">
-			<fileset dir="${basedir}">
-				<exclude name=".classpath"/>
-				<exclude name=".project"/>
-				<exclude name="about.html"/>
-				<exclude name="build.properties"/>
-				<exclude name="build.xml"/>
-				<exclude name="ivy.xml"/>
-				<exclude name="plugin.properties"/>
-				<exclude name="plugin.xml"/>
-				<exclude name="about_files/**"/>
-				<exclude name="resources/**"/>
-				<exclude name="META-INF/**"/>
-				<exclude name="src/**" />
-			</fileset>
-		</delete>
-	</target>
 </project>
+

Modified: directory/studio/trunk/studio-ldapbrowser-ui/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/plugin.properties?view=diff&rev=546821&r1=546820&r2=546821
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/plugin.properties (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/plugin.properties Wed Jun 13 04:04:38 2007
@@ -1,2 +1,22 @@
+#  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.
+project.name=Apache Directory Studio Browser UI Plugin
+project.version=0.8.0
+project.id=org.apache.directory.studio.ldapbrowser.ui
+
 searchMenu.label=Se&arch
 openLDAPSearchPageAction.label=&LDAP Search...



Mime
View raw message