[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [platform-swt-dev] Re: [platform-core-dev] Building libraries - Suggestion

>>>>> "Veronika" == Veronika Irvine <Veronika_Irvine@xxxxxxx> writes:

Veronika> You might want to first check out the existing scripts such
Veronika> as the make_gtk.xml script in SWT PI/gtk/library.

Thanks for pointing this out.  I'm working from a 2.0.1 code base, and
I don't see this script in my copy of the sources.  But I see it on
the CVS trunk.

Veronika> Rather than invoking make from the ant script, we prefer to
Veronika> invoke the build script - on some platforms the build script
Veronika> does additional work

Ok.

The appended patch removes the dependency on csh.  Using csh script is
unusual; using sh is far more typical.  We'd prefer not to have a
build dependency on csh.

Basically I just transcribed build.csh into sh and fixed up
make_gtk.xml.  After this patch you could `cvs rm build.csh'.

Tom

Index: build.sh
===================================================================
RCS file: build.sh
diff -N build.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ build.sh 3 Dec 2002 20:19:34 -0000
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+#**********************************************************************
+# Copyright (c) 2000, 2002 IBM Corp. All rights reserved.
+# The contents of this file are made available under the terms
+# of the GNU Lesser General Public License (LGPL) Version 2.1 that
+# accompanies this distribution (lgpl-v21.txt).  The LGPL is also
+# available at http://www.gnu.org/licenses/lgpl.html.  If the version
+# of the LGPL at http://www.gnu.org is different to the version of
+# the LGPL accompanying this distribution and there is any conflict
+# between the two license versions, the terms of the LGPL accompanying
+# this distribution shall govern.
+#********************************************************************** 
+
+# Some UNIX/Linux compilers don't like <CR>'s in files (DOS format).
+fixup_files=`grep -l "\
" *.[ch]`
+if test -n "$fixup_files"; then
+    echo "Converting files from DOS to UNIX format:"
+    for file in $fixup_files; do
+	echo "    $file"
+	ex $file << EOF 2> /dev/null
+g/
\$/s///
+w
+EOF
+    done
+fi
+
+# Determine the operating system being built
+
+make -f make_gtk.mak ${1+"$@"}
Index: make_gtk.xml
===================================================================
RCS file: /home/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_gtk.xml,v
retrieving revision 1.1
diff -u -r1.1 make_gtk.xml
--- make_gtk.xml 14 Nov 2002 21:41:19 -0000 1.1
+++ make_gtk.xml 3 Dec 2002 20:19:34 -0000
@@ -17,12 +17,12 @@
 <!-- Output .so for this platform into the org.eclipse.swt.gtk/os directory -->
 <!--        .log files from the compilers in the org.eclipse.swt/ directory       -->  
 <target name="build_dll" depends="init">
-	<exec dir="./bin/library" executable="csh" output="${log_dir}/build_log.txt">
-		<arg line="${basedir}/bin/library/build.csh"/>
+	<exec dir="./bin/library" executable="sh" output="${log_dir}/build_log.txt">
+		<arg line="${basedir}/bin/library/build.sh"/>
 		<arg line="clean"/>
 	</exec>
-	<exec dir="./bin/library" executable="csh" output="${log_dir}/build_log.txt">
-		<arg line="${basedir}/bin/library/build.csh"/>
+	<exec dir="./bin/library" executable="sh" output="${log_dir}/build_log.txt">
+		<arg line="${basedir}/bin/library/build.sh"/>
 	</exec>
 	<copy todir="${dll_destdir}">
 		<fileset dir="${basedir}/bin/library/" includes="*.so"/>