[Monodevelop-patches-list] r1932 - in branches/MonoDevelop-plan-43: . src/Libraries src/Libraries/Gdl src/Plugins

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Wed Aug 11 10:06:40 EDT 2004


Author: jzwart
Date: 2004-08-11 10:06:40 -0400 (Wed, 11 Aug 2004)
New Revision: 1932

Removed:
   branches/MonoDevelop-plan-43/build/
Modified:
   branches/MonoDevelop-plan-43/ChangeLog
   branches/MonoDevelop-plan-43/default.build
   branches/MonoDevelop-plan-43/src/Libraries/Gdl/gdl.build
   branches/MonoDevelop-plan-43/src/Libraries/libraries.build
   branches/MonoDevelop-plan-43/src/Plugins/plugins.build
Log:
2004-08-11  Jeroen Zwartepoorte  <jeroen at xs4all.nl>

	Ditch the build dir from svn. Added the Gdl sources to the build.



Modified: branches/MonoDevelop-plan-43/ChangeLog
===================================================================
--- branches/MonoDevelop-plan-43/ChangeLog	2004-08-11 13:49:39 UTC (rev 1931)
+++ branches/MonoDevelop-plan-43/ChangeLog	2004-08-11 14:06:40 UTC (rev 1932)
@@ -1,5 +1,9 @@
 2004-08-11  Jeroen Zwartepoorte  <jeroen at xs4all.nl>
 
+	Ditch the build dir from svn. Added the Gdl sources to the build.
+
+2004-08-11  Jeroen Zwartepoorte  <jeroen at xs4all.nl>
+
 	Move plugins to src/Plugins directory and add a new src/Libaries dir
 	which contains the Gdl library only for now.
 

Modified: branches/MonoDevelop-plan-43/default.build
===================================================================
--- branches/MonoDevelop-plan-43/default.build	2004-08-11 13:49:39 UTC (rev 1931)
+++ branches/MonoDevelop-plan-43/default.build	2004-08-11 14:06:40 UTC (rev 1932)
@@ -11,18 +11,88 @@
     <property name="lib.dir" value="${path::combine(build.dir, 'lib')}"/>
     <property name="share.dir" value="${path::combine(build.dir, 'share/monodevelop')}"/>
 
+    <!-- check for pkg-config dependencies and initialize properties -->
+    <target name="init" description="initializes build properties">
+        <!-- check for gtk-sharp-2.0 -->
+        <if test="${pkg-config::exists('gtk-sharp-2.0')}">
+            <if test="${pkg-config::is-atleast-version('gtk-sharp-2.0', '1.2.99')}">
+                <property name="gtk-sharp.libs" value="${pkg-config::get-link-flags('gtk-sharp-2.0')}"/>
+            </if>
+        </if>
+        <!-- check for gnome-vfs-sharp-2.0 -->
+        <if test="${pkg-config::exists('gnome-vfs-sharp-2.0')}">
+            <if test="${pkg-config::is-atleast-version('gnome-vfs-sharp-2.0', '1.2.99')}">
+                <property name="gnome-vfs-sharp.libs" value="${pkg-config::get-link-flags('gnome-vfs-sharp-2.0')}"/>
+            </if>
+        </if>
+        <!-- check for gnome-sharp -->
+        <if test="${pkg-config::exists('gnome-sharp-2.0')}">
+            <if test="${pkg-config::is-atleast-version('gnome-sharp-2.0', '1.2.99')}">
+                <property name="gnome-sharp.libs" value="${pkg-config::get-link-flags('gnome-sharp-2.0')}"/>
+            </if>
+        </if>
+        <!-- check for glade-sharp -->
+        <if test="${pkg-config::exists('glade-sharp-2.0')}">
+            <if test="${pkg-config::is-atleast-version('glade-sharp-2.0', '1.2.99')}">
+                <property name="glade-sharp.libs" value="${pkg-config::get-link-flags('glade-sharp-2.0')}"/>
+            </if>
+        </if>
+        <!-- check for gtksourceview-sharp -->
+        <if test="${pkg-config::exists('gtksourceview-sharp')}">
+            <if test="${pkg-config::is-atleast-version('gtksourceview-sharp', '0.3')}">
+                <property name="gtksourceview-sharp.libs" value="${pkg-config::get-link-flags('gtksourceview-sharp')}"/>
+            </if>
+        </if>
+        
+        <!-- output a message about required dependencies if not all dependencies exist -->
+        <if test="${not(property::exists('gtk-sharp.libs'))}">
+            <call target="dependencies"/>
+            <fail message="gtk-sharp dependency not found"/>
+        </if>
+        <if test="${not(property::exists('gnome-vfs-sharp.libs'))}">
+            <call target="dependencies"/>
+            <fail message="gnome-vfs-sharp dependency not found"/>
+        </if>
+        <if test="${not(property::exists('gnome-sharp.libs'))}">
+            <call target="dependencies"/>
+            <fail message="gnome-sharp dependency not found"/>
+        </if>
+        <if test="${not(property::exists('glade-sharp.libs'))}">
+            <call target="dependencies"/>
+            <fail message="glade-sharp dependency not found"/>
+        </if>
+        <if test="${not(property::exists('gtksourceview-sharp.libs'))}">
+            <call target="dependencies"/>
+            <fail message="gtksourceview-sharp dependency not found"/>
+        </if>
+    </target>
+
+    <!-- output a list of required dependencies -->
+    <target name="dependencies" description="outputs a list of required dependencies">
+        <echo message="MonoDevelop requires the following dependencies:"/>
+        <echo message="    gtk-sharp-2.0 >= 1.2.99"/>
+        <echo message="    gnome-vfs-sharp-2.0 >= 1.2.99"/>
+        <echo message="    gnome-sharp-2.0 >= 1.2.99"/>
+        <echo message="    glade-sharp-2.0 >= 1.2.99"/>
+        <echo message="    gtksourceview-sharp >= 0.4"/>
+        <echo message=""/>
+        <echo message="Install these packages first before building MonoDevelop"/>
+    </target>
+
     <!-- cleanup build files -->
     <target name="clean" description="remove all files created by the build task">
         <!-- clean up plugin build files -->
-        <nant buildfile="src/plugins.build" target="clean"/>
+        <nant buildfile="src/Plugins/plugins.build" target="clean"/>
         <!-- clean up monodevelop build files -->
         <nant buildfile="src/Core/core.build" target="clean"/>
+        <!-- clean up library build files -->
+        <nant buildfile="src/Libraries/libraries.build" target="clean"/>
         <!-- remove the build directory -->
         <delete dir="${build.dir}" failonerror="false"/>
     </target>
 
     <!-- build the project -->
-    <target name="build" description="compiles the source code">
+    <target name="build" depends="init" description="compiles the source code">
         <!-- create directories -->
         <mkdir dir="${build.dir}"/>
         <mkdir dir="${bin.dir}"/>
@@ -30,8 +100,10 @@
         <mkdir dir="${share.dir}"/>
         <!-- build monodevelop.exe -->
         <nant buildfile="src/Core/core.build" target="build"/>
+        <!-- build the libraries -->
+        <nant buildfile="src/Libraries/libraries.build" target="build"/>
         <!-- build the plugins -->
-        <nant buildfile="src/plugins.build" target="build"/>
+        <nant buildfile="src/Plugins/plugins.build" target="build"/>
     </target>
     
     <!-- run MonoDevelop -->

Modified: branches/MonoDevelop-plan-43/src/Libraries/Gdl/gdl.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Libraries/Gdl/gdl.build	2004-08-11 13:49:39 UTC (rev 1931)
+++ branches/MonoDevelop-plan-43/src/Libraries/Gdl/gdl.build	2004-08-11 14:06:40 UTC (rev 1932)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<project name="monodevelop.libraries.gdl" default="build">
+    <target name="build" description="compiles the source code">
+        <csc target="library" output="${path::combine(lib.dir, 'gdl-sharp.dll')}" debug="${build.debug}">
+            <arg value="${gtk-sharp.libs}"/>
+            <sources>
+                <include name="*.cs"/>
+                <exclude name="GdlDockTest.cs"/>
+            </sources>
+        </csc>
+    </target>
+</project>

Modified: branches/MonoDevelop-plan-43/src/Libraries/libraries.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Libraries/libraries.build	2004-08-11 13:49:39 UTC (rev 1931)
+++ branches/MonoDevelop-plan-43/src/Libraries/libraries.build	2004-08-11 14:06:40 UTC (rev 1932)
@@ -1,3 +1,13 @@
 <?xml version="1.0"?>
 <project name="monodevelop.libraries" default="build">
+    <!-- cleanup build files -->
+    <target name="clean" description="remove all files created by the build task">
+        <nant buildfile="Gdl/gdl.build" target="clean"/>
+    </target>
+
+    <!-- build the project -->
+    <target name="build" description="compiles the source code">
+        <!-- build Gdl library -->
+        <nant buildfile="Gdl/gdl.build" target="build"/>
+    </target>
 </project>

Modified: branches/MonoDevelop-plan-43/src/Plugins/plugins.build
===================================================================
--- branches/MonoDevelop-plan-43/src/Plugins/plugins.build	2004-08-11 13:49:39 UTC (rev 1931)
+++ branches/MonoDevelop-plan-43/src/Plugins/plugins.build	2004-08-11 14:06:40 UTC (rev 1932)
@@ -3,68 +3,13 @@
     <property name="plugin.dir" value="${path::combine(lib.dir, 'monodevelop')}"/>
     <property name="ui.dir" value="${path::combine(share.dir, 'ui')}"/>
 
-    <!-- check for pkg-config dependencies and initialize properties -->
-    <target name="init" description="initializes build properties">
-        <!-- check for gtk-sharp-2.0 -->
-        <if test="${pkg-config::exists('gtk-sharp-2.0')}">
-            <if test="${pkg-config::is-atleast-version('gtk-sharp-2.0', '1.2.99')}">
-                <property name="gtk-sharp.libs" value="${pkg-config::get-link-flags('gtk-sharp-2.0')}"/>
-            </if>
-        </if>
-        <!-- check for gnome-vfs-sharp-2.0 -->
-        <if test="${pkg-config::exists('gnome-vfs-sharp-2.0')}">
-            <if test="${pkg-config::is-atleast-version('gnome-vfs-sharp-2.0', '1.2.99')}">
-                <property name="gnome-vfs-sharp.libs" value="${pkg-config::get-link-flags('gnome-vfs-sharp-2.0')}"/>
-            </if>
-        </if>
-        <!-- check for gnome-sharp -->
-        <if test="${pkg-config::exists('gnome-sharp-2.0')}">
-            <if test="${pkg-config::is-atleast-version('gnome-sharp-2.0', '1.2.99')}">
-                <property name="gnome-sharp.libs" value="${pkg-config::get-link-flags('gnome-sharp-2.0')}"/>
-            </if>
-        </if>
-        <!-- check for gtksourceview-sharp -->
-        <if test="${pkg-config::exists('gtksourceview-sharp')}">
-            <if test="${pkg-config::is-atleast-version('gtksourceview-sharp', '0.3')}">
-                <property name="gtksourceview-sharp.libs" value="${pkg-config::get-link-flags('gtksourceview-sharp')}"/>
-            </if>
-        </if>
-        
-        <!-- output a message about required dependencies if not all dependencies exist -->
-        <if test="${not(property::exists('gtk-sharp.libs'))}">
-            <call target="dependencies"/>
-            <fail message="gtk-sharp dependency not found"/>
-        </if>
-        <if test="${not(property::exists('gnome-vfs-sharp.libs'))}">
-            <call target="dependencies"/>
-            <fail message="gnome-vfs-sharp dependency not found"/>
-        </if>
-        <if test="${not(property::exists('gnome-sharp.libs'))}">
-            <call target="dependencies"/>
-            <fail message="gnome-sharp dependency not found"/>
-        </if>
-        <if test="${not(property::exists('gtksourceview-sharp.libs'))}">
-            <call target="dependencies"/>
-            <fail message="gtksourceview-sharp dependency not found"/>
-        </if>
-    </target>
-
-    <!-- output a list of required dependencies -->
-    <target name="dependencies" description="outputs a list of required dependencies">
-        <echo message="MonoDevelop requires the following dependencies:"/>
-        <echo message="    gtk-sharp-2.0 >= 1.2.99"/>
-        <echo message="    gtksourceview-sharp >= 0.4"/>
-        <echo message=""/>
-        <echo message="Install these packages first before building MonoDevelop"/>
-    </target>
-
     <!-- cleanup build files -->
     <target name="clean" description="remove all files created by the build task">
         <delete dir="${plugin.dir}" failonerror="false"/>
     </target>
 
     <!-- build the project -->
-    <target name="build" depends="init" description="compiles the source code">
+    <target name="build" description="compiles the source code">
         <!-- create directories -->
         <mkdir dir="${plugin.dir}"/>
         <!-- build MonoDevelop.Node assembly -->




More information about the Monodevelop-patches-list mailing list