* scripts/script.in: Add @framework_version@ blank.

* scripts/script2.in: Remove.
* scripts/Makefile.am: Update.  Use wsdl.exe for wsdl2 and
monop.exe for monop2.

svn path=/trunk/mono/; revision=47161

diff --git a/ChangeLog b/ChangeLog
index a60acbeedee7ad2aeaa0a355bfe36f08a1fd37e2..e0c4ce29826838ac4217fe6b5c1fc7332da7c418 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-11  Raja R Harinath  <rharinath@novell.com>
+
+       * scripts/script.in: Add @framework_version@ blank.
+       * scripts/script2.in: Remove.
+       * scripts/Makefile.am: Update.  Use wsdl.exe for wsdl2 and
+       monop.exe for monop2.
+
 2005-07-04  Raja R Harinath  <rharinath@novell.com>
 
        * Makefile.am (EXTRA_DIST): Distribute mono-uninstalled.pc.in.

diff --git a/Makefile.am b/Makefile.am
index dfb63743bd3cdb74f394ceb503ac2a84b12cb20b..b9064e10ee6072632bc3f646bfe3fd0f2f0eeacb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts
 ## 'tools' is not normally built
 DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools 
 
-EXTRA_DIST= mono.pc.in mint.pc.in
+EXTRA_DIST= mono.pc.in mint.pc.in mono-uninstalled.pc.in
 
 # Distribute the 'mcs' tree too
 dist-hook:
@@ -20,7 +20,8 @@ pkgconfig_DATA= mono.pc mint.pc
 else
 pkgconfig_DATA= mint.pc
 endif
-DISTCLEANFILES= mono.pc mint.pc
+noinst_DATA = mono-uninstalled.pc
+DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.pc
 
 .PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
 

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3f0894bb177bd78d229f5091c2dbbf135008008f..f5f649cd8d890c896d8deec95d36c8d020d37d69 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,18 +1,6 @@
-EXTRA_DIST =                   \
-       script.in              \
-       script2.in             \
-       mono-service.in        \
-       mono-nunit.pc.in       \
-       mono-find-provides.in  \
-       mono-find-requires.in
+bin_SCRIPTS = $(scripts_1.0) $(scripts_2.0) gmcs mono-service $(scripts_rpmhelpers)
 
-DISTCLEANFILES = $(pkgconfig_DATA) $(rpmscripts_SCRIPTS)
-
-bin2dir = $(bindir)
-servicedir = $(bindir)
-rpmscriptsdir = $(bindir)
-
-bin_SCRIPTS = \
+scripts_1.0 = \
        al                      \
        caspol                  \
        cert2spc                \
@@ -44,54 +32,62 @@ bin_SCRIPTS = \
        wsdl                    \
        xsd
 
-bin2_SCRIPTS =                                         \
-       gmcs                                    \
-       monop2                                  \
+scripts_2.0 = \
+       monop2                  \
        wsdl2
 
-service_SCRIPTS = mono-service
+scripts_rpmhelpers = mono-find-provides mono-find-requires
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= mono-nunit.pc
 
-rpmscripts_SCRIPTS = mono-find-provides mono-find-requires
+CLEANFILES = $(scripts_1.0) $(scripts_2.0) gmcs mono-service
+DISTCLEANFILES = $(pkgconfig_DATA) $(scripts_rpmhelpers)
 
-CLEANFILES = $(bin_SCRIPTS) $(bin2_SCRIPTS) $(service_SCRIPTS)
+EXTRA_DIST =                   \
+       script.in              \
+       mono-service.in        \
+       mono-nunit.pc.in       \
+       mono-find-provides.in  \
+       mono-find-requires.in
 
 if USE_JIT
-MONO_INTERP = mono
+mono_interp = mono
 else
-MONO_INTERP = mint
+mono_interp = mint
 endif
 
 if PLATFORM_WIN32
 plat_bindir = $(shell cygpath -m $(libdir))
-mono_one_instdir = $(shell cygpath -m $(libdir))/mono/1.0
-mono_two_instdir = $(shell cygpath -m $(libdir))/mono/2.0
+mono_instdir = $(shell cygpath -m $(libdir))/mono
 else
 plat_bindir = $(bindir)
-mono_one_instdir = $(prefix)/lib/mono/1.0
-mono_two_instdir = $(prefix)/lib/mono/2.0
+mono_instdir = $(prefix)/lib/mono
 endif
 
 REWRITE = sed \
        -e 's,@''bindir@,$(bindir),g'                           \
        -e 's,@''plat_bindir@,$(plat_bindir),g'                 \
-       -e 's,@''mono_one_instdir@,$(mono_one_instdir),g'       \
-       -e 's,@''mono_two_instdir@,$(mono_two_instdir),g'       \
+       -e 's,@''mono_instdir@,$(mono_instdir),g'               \
        -e 's,@''gtkdir@,$(gtkdir),g'                           \
-       -e 's,@''exe_file@,$@.exe,g'                            \
-       -e 's,@''mono_interp@,$(MONO_INTERP),g'
+       -e 's,@''mono_interp@,$(mono_interp),g'
+
+REWRITE1 = $(REWRITE) -e 's,@''framework_version@,1.0,g'
+REWRITE2 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
 
 mono-service: mono-service.in Makefile
-       $(REWRITE) $(srcdir)/mono-service.in > $@.tmp
+       $(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
        mv $@.tmp $@
 
-$(bin_SCRIPTS): script.in Makefile
-       $(REWRITE) $(srcdir)/script.in > $@.tmp
+$(scripts_1.0): script.in Makefile
+       $(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/script.in > $@.tmp
        mv $@.tmp $@
 
-$(bin2_SCRIPTS): script2.in Makefile
-       $(REWRITE) $(srcdir)/script2.in > $@.tmp
+gmcs: script.in Makefile
+       $(REWRITE2) -e 's,@''exe_name@,$@,g' $(srcdir)/script.in > $@.tmp
        mv $@.tmp $@
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= mono-nunit.pc
-
+$(scripts_2.0): script.in Makefile
+       n=`echo $@ | sed 's,2$$,,'`; \
+       $(REWRITE2) -e "s,@""exe_name@,$$n,g" $(srcdir)/script.in > $@.tmp
+       mv $@.tmp $@

diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index c3f59fdd763ef5b07abf6eda9cd017639001bf3f..b144b34e9de626b6c2ddfa4e425cec12b4063757 100644 (file)
--- a/scripts/mono-find-provides.in
+++ b/scripts/mono-find-provides.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # mono-find-provides
 #

diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
index b602afd63391975c7764e53b39d77c80807508a0..46c939ef97068305a4668a2c7a5b9681f1aa064c 100644 (file)
--- a/scripts/mono-find-requires.in
+++ b/scripts/mono-find-requires.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # mono-find-requires
 #

diff --git a/scripts/mono-service.in b/scripts/mono-service.in
index 27bf6f917f2c79537bae644f008f94937bd8a659..25b789902c47f9701726dcd26f6bdb6f22510013 100644 (file)
--- a/scripts/mono-service.in
+++ b/scripts/mono-service.in
@@ -29,4 +29,4 @@ if test x$assembly = x; then
 fi
 
 export MONO_DISABLE_SHM=1
-exec @bindir@/@mono_interp@ @mono_one_instdir@/@exe_file@ $args </dev/null >& /dev/null &
+exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe $args </dev/null >& /dev/null &

diff --git a/scripts/script.in b/scripts/script.in
index e68eb084cb30126e3903636eb1a94d2d7982a49e..ef0e2bcffeac50a127d4e4064ef359fc57edbbb7 100644 (file)
--- a/scripts/script.in
+++ b/scripts/script.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/@exe_file@ "$@"
+exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe "$@"

diff --git a/scripts/script2.in b/scripts/script2.in
deleted file mode 100644 (file)
index 0b594f3..0000000
--- a/scripts/script2.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_two_instdir@/@exe_file@ "$@"