Author: wade
Date: 2007-02-26 13:31:04 -0500 (Mon, 26 Feb 2007)
New Revision: 73439
Modified:
trunk/olive/ChangeLog
trunk/olive/Makefile
trunk/olive/build/ChangeLog
trunk/olive/build/Makefile
trunk/olive/class/ChangeLog
trunk/olive/class/Makefile
trunk/olive/class/System.Workflow.Activities/System.Workflow.Activities_test.dll.sources
trunk/olive/data/ChangeLog
trunk/olive/data/Makefile
trunk/olive/scripts/Makefile
Log:
* class/Makefile: remove non-existant files from DISTFILES
* scripts/Makefile: add script.in to DISTFILES and use
correct DISTFILES target
* Makefile: add .pc file to DISTFILES
class/System.Workflow.Activities/System.Workflow.Activities_test.dll.sources:
-set eol-style:native (otherwise make dist fails because it adds part of the dos
line ending to the filename when trying to copy)
Modified: trunk/olive/ChangeLog
===================================================================
--- trunk/olive/ChangeLog 2007-02-26 16:20:35 UTC (rev 73438)
+++ trunk/olive/ChangeLog 2007-02-26 18:31:04 UTC (rev 73439)
@@ -1,3 +1,8 @@
+2007-02-26 Wade Berrier <[EMAIL PROTECTED]>
+
+ * scripts/Makefile: add script.in to DISTFILES and use
+ correct DISTFILES target
+
2006-10-22 Atsushi Enomoto <[EMAIL PROTECTED]>
(started to log)
Modified: trunk/olive/Makefile
===================================================================
--- trunk/olive/Makefile 2007-02-26 16:20:35 UTC (rev 73438)
+++ trunk/olive/Makefile 2007-02-26 18:31:04 UTC (rev 73439)
@@ -48,7 +48,7 @@
$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=default TEST_RUNTIME=mono
MCS=mcs run-test
$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=net_2_0 TEST_RUNTIME=mono
MCS=gmcs run-test
-package := olive
+package := olive-$(MONO_VERSION)
dist-local: dist-default
Modified: trunk/olive/build/ChangeLog
===================================================================
--- trunk/olive/build/ChangeLog 2007-02-26 16:20:35 UTC (rev 73438)
+++ trunk/olive/build/ChangeLog 2007-02-26 18:31:04 UTC (rev 73439)
@@ -1,3 +1,7 @@
+2007-02-26 Wade Berrier <[EMAIL PROTECTED]>
+
+ * Makefile: remove non-existant files from DISTFILES
+
2005-10-22 Atsushi Enomoto <[EMAIL PROTECTED]>
* rules.make : target dll-sources (formerly updated-dll-sources).
Modified: trunk/olive/build/Makefile
===================================================================
--- trunk/olive/build/Makefile 2007-02-26 16:20:35 UTC (rev 73438)
+++ trunk/olive/build/Makefile 2007-02-26 18:31:04 UTC (rev 73439)
@@ -24,9 +24,6 @@
TestConfiguration.cs
DISTFILES = \
- README.makefiles \
- README.platforms \
- README.configury \
config-default.make \
executable.make \
library.make \
Modified: trunk/olive/class/ChangeLog
===================================================================
--- trunk/olive/class/ChangeLog 2007-02-26 16:20:35 UTC (rev 73438)
+++ trunk/olive/class/ChangeLog 2007-02-26 18:31:04 UTC (rev 73439)
@@ -1,3 +1,7 @@
+2007-02-26 Wade Berrier <[EMAIL PROTECTED]>
+
+ * Makefile: remove non-existant files from DISTFILES
+
2007-02-06 Atsushi Enomoto <[EMAIL PROTECTED]>
* Makefile : System.Xml.XLinq -> System.Xml.Linq
Modified: trunk/olive/class/Makefile
===================================================================
--- trunk/olive/class/Makefile 2007-02-26 16:20:35 UTC (rev 73438)
+++ trunk/olive/class/Makefile 2007-02-26 18:31:04 UTC (rev 73439)
@@ -18,10 +18,9 @@
System.IdentityModel.Selectors \
System.ServiceModel
-DISTFILES = \
- LICENSE \
- README \
+dist-local: dist-default
+
.PHONY: all-local $(STD_TARGETS:=-local)
all-local $(STD_TARGETS:=-local):
@:
Modified:
trunk/olive/class/System.Workflow.Activities/System.Workflow.Activities_test.dll.sources
===================================================================
---
trunk/olive/class/System.Workflow.Activities/System.Workflow.Activities_test.dll.sources
2007-02-26 16:20:35 UTC (rev 73438)
+++
trunk/olive/class/System.Workflow.Activities/System.Workflow.Activities_test.dll.sources
2007-02-26 18:31:04 UTC (rev 73439)
@@ -1,5 +1,5 @@
-System.Workflow.Activities/CodeActivityTest.cs
-System.Workflow.Activities/IfElseActivityTest.cs
-System.Workflow.Activities.Rules/RulesBinaryOpTest.cs
-System.Workflow.Activities/ExternalDataExchangeServiceTest.cs
+System.Workflow.Activities/CodeActivityTest.cs
+System.Workflow.Activities/IfElseActivityTest.cs
+System.Workflow.Activities.Rules/RulesBinaryOpTest.cs
+System.Workflow.Activities/ExternalDataExchangeServiceTest.cs
System.Workflow.Activities/CallExternalMethodActivityTest.cs
\ No newline at end of file
Property changes on:
trunk/olive/class/System.Workflow.Activities/System.Workflow.Activities_test.dll.sources
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/olive/data/ChangeLog
===================================================================
--- trunk/olive/data/ChangeLog 2007-02-26 16:20:35 UTC (rev 73438)
+++ trunk/olive/data/ChangeLog 2007-02-26 18:31:04 UTC (rev 73439)
@@ -1,3 +1,7 @@
+2007-02-26 Wade Berrier <[EMAIL PROTECTED]>
+
+ * Makefile: add .pc file to DISTFILES
+
2006-12-05 Rafael Teixeira <[EMAIL PROTECTED]>
* Makefile: add -rf to rm so that it doesn't break on clean a
half-built project
add a test-local dummy target so that it doesn't break make test
Modified: trunk/olive/data/Makefile
===================================================================
--- trunk/olive/data/Makefile 2007-02-26 16:20:35 UTC (rev 73438)
+++ trunk/olive/data/Makefile 2007-02-26 18:31:04 UTC (rev 73439)
@@ -10,6 +10,8 @@
all-local: olive.pc
+DISTFILES = olive.pc.in
+
REWRITE=
olive.pc: olive.pc.in Makefile
sed -e "s,@olivedir@,$(olivedir),g" -e "s,@VERSION@,$(MONO_VERSION),g"
< olive.pc.in > [EMAIL PROTECTED]
@@ -22,3 +24,5 @@
rm -rf olive.pc
test-local:
+
+dist-local: dist-default
Modified: trunk/olive/scripts/Makefile
===================================================================
--- trunk/olive/scripts/Makefile 2007-02-26 16:20:35 UTC (rev 73438)
+++ trunk/olive/scripts/Makefile 2007-02-26 18:31:04 UTC (rev 73439)
@@ -10,7 +10,7 @@
sts \
svcutil
-EXTRA_DIST = \
+DISTFILES = \
script.in
# FIXME: if we still want to use mint then we need switch like
mono/scripts/Makefile.am
@@ -50,3 +50,4 @@
clean-local:
rm -f $(scripts_3_0)
+dist-local: dist-default
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches