[Dotgnu-pnet-commits] pnetlib/JScript JScript.build, 1.10, 1.11 Makefile.am, 1.2, 1.3

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/JScript
In directory subversions:/tmp/cvs-serv14391/JScript

Modified Files:
        JScript.build Makefile.am 
Log Message:


Change install/uninstall for the core assemblies over to use the
csant/ilgac mechanism, and remove the now-unnecessary pnetlib.here files.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/JScript/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am 29 Oct 2003 21:09:32 -0000      1.2
--- Makefile.am 26 Nov 2003 06:43:34 -0000      1.3
***************
*** 16,24 ****
  CLEANFILES = Microsoft.JScript.dll JScript.Test.dll Nodes/JNode.cs jsrun.exe
  
- pnetassembliesdir = $(libdir)/cscc/lib
- pnetassemblies_DATA = Microsoft.JScript.dll
- 
  install-exec-local:
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(bindir)
        $(INSTALL_PROGRAM) jsrun.exe $(DESTDIR)$(bindir)/jsrun.exe
--- 16,24 ----
  CLEANFILES = Microsoft.JScript.dll JScript.Test.dll Nodes/JNode.cs jsrun.exe
  
  install-exec-local:
        @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(libdir)/cscc/lib
+       "$(CSANT)" $(CSANT_FLAGS) -f JScript.build \
+                       -a $(DESTDIR)$(libdir)/cscc/lib -i all
        $(mkinstalldirs) $(DESTDIR)$(bindir)
        $(INSTALL_PROGRAM) jsrun.exe $(DESTDIR)$(bindir)/jsrun.exe
***************
*** 27,30 ****
--- 27,32 ----
  uninstall-local:
        @$(NORMALL_UNINSTALL)
+       "$(CSANT)" $(CSANT_FLAGS) -f JScript.build \
+                       -a $(DESTDIR)$(libdir)/cscc/lib -u all
        rm -f $(DESTDIR)$(bindir)/jsrun.exe
        rm -f $(DESTDIR)$(bindir)/jsrun

Index: JScript.build
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/JScript/JScript.build,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JScript.build       24 Nov 2003 07:30:05 -0000      1.10
--- JScript.build       26 Nov 2003 06:43:34 -0000      1.11
***************
*** 9,13 ****
                                 nostdlib="true"
                                 debug="${CONFIG_DEBUG_LINES}"
!                                optimize="true">
  
                        <sources>
--- 9,15 ----
                                 nostdlib="true"
                                 debug="${CONFIG_DEBUG_LINES}"
!                                optimize="true"
!                                install="true"
!                                installasdefault="${INSTALL_AS_DEFAULT}">
  
                        <sources>