Author: wade
Date: 2007-09-04 17:23:03 -0400 (Tue, 04 Sep 2007)
New Revision: 85325
Added:
trunk/mcs/tools/removecomments.sh
Modified:
trunk/mcs/build/ChangeLog
trunk/mcs/build/library.make
trunk/mcs/tools/ChangeLog
trunk/mcs/tools/Makefile
Log:
2007-09-04 Wade Berrier <[EMAIL PROTECTED]>
* removecomments.sh: New script to aid 'make dist'
Removes '#' comments (specifically for .sources files)
Had to put in a separate script because alterint IFS to
contain a newline doesn't work inside make
* Makefile: include gensources.sh, the 2_1 profile needs it.
(Should also make it possible to build the jvm profile from a
tarball)
2007-09-04 Wade Berrier <[EMAIL PROTECTED]>
* library.make: Glob for .sources for all profiles.
Use tools/removecomments.sh to account for '#include' and
comments, which are only used in the jvm profile at this point
Modified: trunk/mcs/build/ChangeLog
===================================================================
--- trunk/mcs/build/ChangeLog 2007-09-04 20:51:33 UTC (rev 85324)
+++ trunk/mcs/build/ChangeLog 2007-09-04 21:23:03 UTC (rev 85325)
@@ -1,3 +1,9 @@
+2007-09-04 Wade Berrier <[EMAIL PROTECTED]>
+
+ * library.make: Glob for .sources for all profiles.
+ Use tools/removecomments.sh to account for '#include' and
+ comments, which are only used in the jvm profile at this point
+
2007-09-01 Jb Evain <[EMAIL PROTECTED]>
* Makefile: consider the net_2_1 profile.
Modified: trunk/mcs/build/library.make
===================================================================
--- trunk/mcs/build/library.make 2007-09-04 20:51:33 UTC (rev 85324)
+++ trunk/mcs/build/library.make 2007-09-04 21:23:03 UTC (rev 85325)
@@ -228,7 +228,7 @@
$(TEST_HARNESS_POSTPROC_ONDOTNET) ; $$ok
endif
-DISTFILES = $(sourcefile) $(EXTRA_DISTFILES)
+DISTFILES = $(wildcard *$(LIBRARY)*.sources) $(EXTRA_DISTFILES)
TEST_FILES =
@@ -241,9 +241,10 @@
DISTFILES += $(btest_sourcefile)
endif
+# make dist will collect files in .sources files from all profiles
dist-local: dist-default
subs=' ' ; \
- for f in `cat $(sourcefile)` $(TEST_FILES) ; do \
+ for f in `$(topdir)/tools/removecomments.sh $(wildcard
*$(LIBRARY).sources)` $(TEST_FILES) ; do \
case $$f in \
../*) : ;; \
*) dest=`dirname $$f` ; \
Modified: trunk/mcs/tools/ChangeLog
===================================================================
--- trunk/mcs/tools/ChangeLog 2007-09-04 20:51:33 UTC (rev 85324)
+++ trunk/mcs/tools/ChangeLog 2007-09-04 21:23:03 UTC (rev 85325)
@@ -1,3 +1,13 @@
+2007-09-04 Wade Berrier <[EMAIL PROTECTED]>
+
+ * removecomments.sh: New script to aid 'make dist'
+ Removes '#' comments (specifically for .sources files)
+ Had to put in a separate script because alterint IFS to
+ contain a newline doesn't work inside make
+
+ * Makefile: include gensources.sh, the 2_1 profile needs it.
+ (Should also make it possible to build the jvm profile from a tarball)
+
2007-07-27 Jb Evain <[EMAIL PROTECTED]>
* Makefile: integrate the tuner in the build.
Modified: trunk/mcs/tools/Makefile
===================================================================
--- trunk/mcs/tools/Makefile 2007-09-04 20:51:33 UTC (rev 85324)
+++ trunk/mcs/tools/Makefile 2007-09-04 21:23:03 UTC (rev 85325)
@@ -22,7 +22,8 @@
mono-win32-setup.nsi \
scan-tests.pl \
tinderbox/smtp.c \
- tinderbox/tinderbox.sh
+ tinderbox/tinderbox.sh \
+ gensources.sh
test-local run-test-local run-test-ondotnet-local all-local install-local
uninstall-local:
@:
Added: trunk/mcs/tools/removecomments.sh
===================================================================
--- trunk/mcs/tools/removecomments.sh 2007-09-04 20:51:33 UTC (rev 85324)
+++ trunk/mcs/tools/removecomments.sh 2007-09-04 21:23:03 UTC (rev 85325)
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Remove comments from .sources files since this usage of IFS is unsuable
inside make
+# (trouble with newlines)
+
+source_files="$@"
+
+OIFS=$IFS
+
+for f in $source_files ; do
+ IFS='
+
'
+ for f in $(cat $f) ; do
+ case $f in
+ \#*) ;;
+ *) echo $f ;;
+ esac
+ done
+ OIFS=$IFS
+done
+
+IFS=$OIFS
+
Property changes on: trunk/mcs/tools/removecomments.sh
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
