[Dotgnu-pnet-commits] ml-pnet/tools/SqlSharp Makefile.am, 1.1, 1.2 SqlSharp.build, 1.2, 1.3

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/ml-pnet/tools/SqlSharp
In directory subversions:/tmp/cvs-serv7340/tools/SqlSharp

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


Modify the build system to use "ilgac" to install assemblies;
infer the correct framework version numbers from pnetlib.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/ml-pnet/tools/SqlSharp/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am 31 May 2003 05:11:13 -0000      1.1
--- Makefile.am 27 Nov 2003 05:18:57 -0000      1.2
***************
*** 6,10 ****
  sqlsharp-pnet.exe:
        "$(CSANT)" $(CSANT_FLAGS) -Dmono.sources="$(MONO_SOURCE_PATH)" \
!                       -f SqlSharp.build all
  
  CLEANFILES = sqlsharp-pnet.exe
--- 6,10 ----
  sqlsharp-pnet.exe:
        "$(CSANT)" $(CSANT_FLAGS) -Dmono.sources="$(MONO_SOURCE_PATH)" \
!                       -b "$(srcdir)" -B . -f SqlSharp.build all
  
  CLEANFILES = sqlsharp-pnet.exe
***************
*** 12,21 ****
  install-exec-local:
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(bindir)
!       $(INSTALL_PROGRAM) sqlsharp-pnet.exe 
$(DESTDIR)$(bindir)/sqlsharp-pnet.exe
!       $(INSTALL_PROGRAM) $(srcdir)/sqlsharp-run.sh 
$(DESTDIR)$(bindir)/sqlsharp-pnet
!       
  uninstall-local:
!       @$(NORMAL_UNINSTALL)
        rm -f $(DESTDIR)$(bindir)/sqlsharp-pnet.exe
        rm -f $(DESTDIR)$(bindir)/sqlsharp-pnet
--- 12,29 ----
  install-exec-local:
        @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(libdir)/cscc/lib
+       "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . \
+                       -Dmono.sources="$(MONO_SOURCE_PATH)" \
+                       -f "$(srcdir)/SqlSharp.build" -i all
        $(mkinstalldirs) $(DESTDIR)$(bindir)
!       rm -f $(DESTDIR)$(bindir)/sqlsharp-pnet.exe
!       rm -f $(DESTDIR)$(bindir)/sqlsharp-pnet
!       $(LN_S) clrwrap $(DESTDIR)$(bindir)/sqlsharp-pnet
! 
  uninstall-local:
!       @$(NORMALL_UNINSTALL)
!       "$(CSANT)" $(CSANT_FLAGS) -b "$(srcdir)" -B . \
!                       -Dmono.sources="$(MONO_SOURCE_PATH)" \
!                       -f "$(srcdir)/SqlSharp.build" -u all
        rm -f $(DESTDIR)$(bindir)/sqlsharp-pnet.exe
        rm -f $(DESTDIR)$(bindir)/sqlsharp-pnet

Index: SqlSharp.build
===================================================================
RCS file: /cvsroot/dotgnu-pnet/ml-pnet/tools/SqlSharp/SqlSharp.build,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SqlSharp.build      31 May 2003 20:30:42 -0000      1.2
--- SqlSharp.build      27 Nov 2003 05:18:57 -0000      1.3
***************
*** 6,10 ****
                                 output="sqlsharp-pnet.exe"
                                 debug="${debug.flag}"
!                                unsafe="false">
  
                        <sources basedir="${mono.sources}/tools/SqlSharp/">
--- 6,12 ----
                                 output="sqlsharp-pnet.exe"
                                 debug="${debug.flag}"
!                                unsafe="false"
!                                install="true"
!                                installasdefault="true">
  
                        <sources basedir="${mono.sources}/tools/SqlSharp/">
***************
*** 19,22 ****
--- 21,28 ----
                                <file 
name="../../class/System.EnterpriseServices/System.EnterpriseServices.dll"/>
                        </references>
+ 
+                       <arg compiler="cscc" 
value="-fassembly-version=${FRAMEWORK_VERSION}"/>
+                       <arg compiler="cscc" value="-Wno-empty-input"/>
+                       <arg compiler="cscc" value="-flatin1-charset"/>
  
                </compile>