Skip to content
Browse files

Backport 113665: scripts are now by default 2.0

svn path=/branches/mono-2-0/xsp/; revision=113742
  • Loading branch information...
1 parent de202dd commit 9f97c3a20438de78e464c05c2eac6c72ec175582 @migueldeicaza migueldeicaza committed Sep 22, 2008
Showing with 30 additions and 4 deletions.
  1. +6 −0 ChangeLog
  2. +24 −4 scripts/Makefile.am
View
6 ChangeLog
@@ -1,3 +1,9 @@
+2008-09-21 Miguel de Icaza <miguel@novell.com>
+
+ * scripts/Makefile.am ($(tool_scripts)): Follow the naming pattern
+ used in Mono 2.0. By default the `script' is a 2.0 script,
+ `script1' is the 1.0 script, and `script2' is the 2.0 script.
+
2008-07-29 Marek Habersack <mhabersack@novell.com>
* test/1.1/webcontrols/dbpage1.aspx: do not rely on the
View
28 scripts/Makefile.am
@@ -6,11 +6,15 @@ bin2_scripts = $(bin2_scripts_real)
tool2_scripts = asp-state2 dbsessmgr2
endif
-bin1_scripts = xsp mod-mono-server fastcgi-mono-server
+bin_scripts = xsp mod-mono-server fastcgi-mono-server
tool_scripts = asp-state dbsessmgr
-bin_SCRIPTS = $(bin1_scripts) $(bin2_scripts) $(tool_scripts) $(tool2_scripts)
-CLEANFILES = $(bin1_scripts) $(bin2_scripts_real) $(tool_scripts) $(tool2_scripts)
+bin1_scripts = xsp1 mod-mono-server1 fastcgi-mono-server1
+tool1_scripts = asp-state1 dbsessmgr1
+
+bin_SCRIPTS = $(bin1_scripts) $(bin2_scripts) $(tool1_scripts) $(tool2_scripts) $(tool_scripts) $(bin_scripts)
+
+CLEANFILES = $(bin1_scripts) $(bin2_scripts_real) $(tool1_scripts) $(tool2_scripts) $(bin_scripts) $(tool_scripts)
plat_bindir = $(prefix)/lib/mono/1.0
plat_bindir2 = $(prefix)/lib/mono/2.0
@@ -41,7 +45,7 @@ $(bin1_scripts): $(srcdir)/script.in Makefile.am
$(REWRITE) $(srcdir)/script.in > $@.tmp
mv $@.tmp $@
-$(tool_scripts): $(srcdir)/script.in Makefile.am
+$(tool1_scripts): $(srcdir)/script.in Makefile.am
$(REWRITE_TOOLS) $(srcdir)/script.in > $@.tmp
mv $@.tmp $@
@@ -53,5 +57,21 @@ $(bin2_scripts): $(srcdir)/script.in Makefile.am
$(tool2_scripts): $(srcdir)/script.in Makefile.am
$(REWRITE_TOOLS2) $(srcdir)/script.in > $@.tmp
mv $@.tmp $@
+
+$(bin_scripts): $(srcdir)/script.in Makefile.am
+ $(REWRITE2) $(srcdir)/script.in > $@.tmp
+ mv $@.tmp $@
+
+$(tool_scripts): $(srcdir)/script.in Makefile.am
+ $(REWRITE_TOOLS2) $(srcdir)/script.in > $@.tmp
+ mv $@.tmp $@
+else
+$(bin_scripts): $(srcdir)/script.in Makefile.am
+ $(REWRITE) $(srcdir)/script.in > $@.tmp
+ mv $@.tmp $@
+
+$(tool_scripts): $(srcdir)/script.in Makefile.am
+ $(REWRITE_TOOLS) $(srcdir)/script.in > $@.tmp
+ mv $@.tmp $@
endif

0 comments on commit 9f97c3a

Please sign in to comment.
Something went wrong with that request. Please try again.