directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r547165 - in /directory/studio/trunk/studio-updatesite: build.xml project.properties
Date Thu, 14 Jun 2007 08:29:14 GMT
Author: pamarcelot
Date: Thu Jun 14 01:29:13 2007
New Revision: 547165

URL: http://svn.apache.org/viewvc?view=rev&rev=547165
Log:
Updated the Apache Directory Studio UpdateSite with the new build system.

Added:
    directory/studio/trunk/studio-updatesite/project.properties
Modified:
    directory/studio/trunk/studio-updatesite/build.xml

Modified: directory/studio/trunk/studio-updatesite/build.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-updatesite/build.xml?view=diff&rev=547165&r1=547164&r2=547165
==============================================================================
--- directory/studio/trunk/studio-updatesite/build.xml (original)
+++ directory/studio/trunk/studio-updatesite/build.xml Thu Jun 14 01:29:13 2007
@@ -16,18 +16,20 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project default="generate" xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
-	<property name="project.name" value="org.apache.directory.studio.updatesite" />
-	<property name="project.version" value="0.8.0" />
+<project default="generate">
+	<import file="../studio-build/build.xml"/>
 
-	<property name="project.plugins" value="${basedir}/plugins" />
-	<property name="project.features" value="${basedir}/features" />
+	<!-- Setting updatesite properties -->
+	<property name="updatesite" value="${target}/updatesite" />
+	<property name="updatesite.plugins" value="${updatesite}/plugins" />
+	<property name="updatesite.features" value="${updatesite}/features" />
 		
-	<!-- ================================== -->
-	<!--                              GENERATE                                  -->
-	<!-- ================================== -->
+	<!-- GENERATE TASK -->
 	<target name="generate" description="Generates the update site. Generates and copies
features and plugins.">
-		
+		<mkdir dir="${updatesite}"/>
+		<mkdir dir="${updatesite.plugins}"/>
+		<mkdir dir="${updatesite.features}"/>
+
 		<!-- Creation of the Features -->
 		<!-- Apache Directory Studio RCP Feature -->
 		<ant dir="../studio-rcp-feature" inheritAll="no" />
@@ -37,9 +39,20 @@
 	    <ant dir="../studio-ldapbrowser-feature" inheritAll="no" />
 	    <!-- Apache Directory Studio Apache DS Configuration Feature -->
 	    <ant dir="../studio-apacheds-configuration-feature" inheritAll="no" />
-	    
+	
+		<!-- Copying updatesite files -->
+	    <copy todir="${updatesite}">
+		    <fileset dir="${basedir}">
+				<include name="index.html" />
+				<include name="site--xml.cgi" />
+				<include name="site--xml.html" />
+				<include name="site.xml" />
+				<include name="web/**" />
+			</fileset>
+		</copy>
+	
 	    <!-- Copying the Features -->
-	    <copy todir="${project.features}">
+	    <copy todir="${updatesite.features}">
             <!-- Apache Directory Studio RCP Feature  -->
             <fileset dir="../studio-rcp-feature/target">
 				<include name="*.jar" />
@@ -89,7 +102,7 @@
 	    <ant dir="../studio-apacheds-configuration-help" inheritAll="no" />
 	    
 	    <!-- Copying the Plugins -->
-	    <copy todir="${project.plugins}">
+	    <copy todir="${updatesite.plugins}">
             <!-- Apache Directory Studio RCP -->
 	        <fileset dir="../studio-rcp/target">
 	            <include name="*.jar" />
@@ -148,34 +161,4 @@
 	        </fileset>
 	    </copy>
 	</target>
-	
-	
-	<!-- ================================== -->
-	<!--                                       CLEAN                              -->
-	<!-- ================================== -->
-	<target name="clean" description="Deletes any generated file">
-		<ant dir="../studio-aciitemeditor" inheritAll="no" target="clean"/>
-		<ant dir="../studio-apacheds-configuration" inheritAll="no" target="clean"/>
-		<ant dir="../studio-apacheds-configuration-feature" inheritAll="no" target="clean"/>
-		<ant dir="../studio-apacheds-configuration-help" inheritAll="no" target="clean"/>
-        <ant dir="../studio-ldapbrowser-common" inheritAll="no" target="clean" />
-        <ant dir="../studio-ldapbrowser-core" inheritAll="no" target="clean" />
-        <ant dir="../studio-ldapbrowser-feature" inheritAll="no" target="clean"/>
-        <ant dir="../studio-ldapbrowser-help" inheritAll="no" target="clean" />
-        <ant dir="../studio-ldapbrowser-ui" inheritAll="no" target="clean" />
-        <ant dir="../studio-jars" inheritAll="no" target="clean" />
-        <ant dir="../studio-ldifeditor" inheritAll="no" target="clean" />
-		<ant dir="../studio-rcp" inheritAll="no" target="clean"/>
-        <ant dir="../studio-rcp-feature" inheritAll="no" target="clean"/>
-		<ant dir="../studio-rcp-help" inheritAll="no" target="clean"/>
-        <ant dir="../studio-schemaeditor-feature" inheritAll="no" target="clean"/>
-        <ant dir="../studio-schemaeditor-help" inheritAll="no" target="clean"/>
-        <ant dir="../studio-schemaeditor-plugin" inheritAll="no" target="clean"/>
-        <ant dir="../studio-valueeditors" inheritAll="no" target="clean"/>
-		<delete includeemptydirs="true">
-			<fileset dir="${project.plugins}"/>
-			<fileset dir="${project.features}"/>
-		</delete>
-	</target>
-	
 </project>

Added: directory/studio/trunk/studio-updatesite/project.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-updatesite/project.properties?view=auto&rev=547165
==============================================================================
--- directory/studio/trunk/studio-updatesite/project.properties (added)
+++ directory/studio/trunk/studio-updatesite/project.properties Thu Jun 14 01:29:13 2007
@@ -0,0 +1,19 @@
+#  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 UpdateSite
+project.version=0.8.0
+project.id=updatesite



Mime
View raw message