directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r497806 - in /directory/trunks/ldapstudio: build.xml ldapstudio-dsml-command/ ldapstudio-dsml-plugin/ ldapstudio-importexport-plugin/
Date Fri, 19 Jan 2007 13:23:58 GMT
Author: pamarcelot
Date: Fri Jan 19 05:23:57 2007
New Revision: 497806

URL: http://svn.apache.org/viewvc?view=rev&rev=497806
Log:
Removing ldapstudio-dsml-command, ldapstudio-dsml-plugin and ldapstudio-importexport-plugin
projects from trunks. Fixing a bug that prevented to build LDAP Studio for Mac OS X any system
other than Mac OS X.

Removed:
    directory/trunks/ldapstudio/ldapstudio-dsml-command/
    directory/trunks/ldapstudio/ldapstudio-dsml-plugin/
    directory/trunks/ldapstudio/ldapstudio-importexport-plugin/
Modified:
    directory/trunks/ldapstudio/build.xml

Modified: directory/trunks/ldapstudio/build.xml
URL: http://svn.apache.org/viewvc/directory/trunks/ldapstudio/build.xml?view=diff&rev=497806&r1=497805&r2=497806
==============================================================================
--- directory/trunks/ldapstudio/build.xml (original)
+++ directory/trunks/ldapstudio/build.xml Fri Jan 19 05:23:57 2007
@@ -26,9 +26,6 @@
     <condition property="ldapstudio-rcp.os.name" value="macosx" >
             <os name="Mac OS X"/>
     </condition>
-    <condition property="isMacOSX" value="true" >
-            <os name="Mac OS X"/>
-    </condition>
     <condition property="ldapstudio-rcp.os.name" value="linux" >
             <os family="unix" />
     </condition>
@@ -47,6 +44,11 @@
         <equals arg1="${ldapstudio-rcp.os.name}" arg2="win32"/>
     </condition>
 
+
+    <condition property="isTargetMacOSX" value="true" >
+            <equals arg1="${ldapstudio-rcp.os.name}" arg2="macosx"/>
+    </condition>
+
     <!-- ================================== -->
     <!--                HELP                -->
     <!-- ================================== -->
@@ -182,7 +184,7 @@
     <!-- ================================== -->
     <!--         Repackage Mac OS X         -->
     <!-- ================================== -->
-    <target name="repackage_MacOSX" description="Special repackage for Mac OS X" if="isMacOSX">
       <property name="app.dir" location="${ldapstudio-complete.build}/LDAP Studio.app"
/>
        <property name="java.dir" location="${app.dir}/Contents/Resources/Java" />
+    <target name="repackage_MacOSX" description="Special repackage for Mac OS X" if="isTargetMacOSX">
       <property name="app.dir" location="${ldapstudio-complete.build}/LDAP Studio.app"
/>
        <property name="java.dir" location="${app.dir}/Contents/Resources/Java" />
         <mkdir dir="${java.dir}"/>
        <move todir="${java.dir}">
      
   <fileset dir="${ldapstudio-complete.build}">
               <exclude name="LDAP
Studio.app/**"/>
          </fileset>
        </move>
     </target>
 
@@ -192,10 +194,7 @@
     <target name="javadoc" description="Generate Javadoc files">
         <ant dir="ldapstudio-rcp" inheritAll="no" target="javadoc" />
         <ant dir="ldapstudio-schemas-plugin" inheritAll="no" target="javadoc" />
-        <ant dir="ldapstudio-importexport-plugin" inheritAll="no" target="javadoc" />
-        <ant dir="ldapstudio-dsml-plugin" inheritAll="no" target="javadoc" />
         <ant dir="ldapstudio-dsml-parser" inheritAll="no" target="javadoc" />
-        <ant dir="ldapstudio-dsml-command" inheritAll="no" target="javadoc" />
         <ant dir="ldapstudio-browser-core" inheritAll="no" target="javadoc" />
         <ant dir="ldapstudio-browser-ui" inheritAll="no" target="javadoc" />
         <ant dir="ldapstudio-aciitemeditor" inheritAll="no" target="javadoc" />
@@ -207,10 +206,7 @@
     <target name="resolve" description="Resolves the library dependencies using Ivy">
         <ant dir="ldapstudio-rcp" inheritAll="no" target="resolve" />
         <ant dir="ldapstudio-schemas-plugin" inheritAll="no" target="resolve" />
-        <ant dir="ldapstudio-importexport-plugin" inheritAll="no" target="resolve" />
-        <ant dir="ldapstudio-dsml-plugin" inheritAll="no" target="resolve" />
         <ant dir="ldapstudio-dsml-parser" inheritAll="no" target="resolve" />
-        <ant dir="ldapstudio-dsml-command" inheritAll="no" target="resolve" />
         <ant dir="ldapstudio-browser-core" inheritAll="no" target="resolve" />
         <ant dir="ldapstudio-browser-ui" inheritAll="no" target="resolve" />
         <ant dir="ldapstudio-aciitemeditor" inheritAll="no" target="resolve" />



Mime
View raw message