[Dotgnu-pnet-commits] pnetlib ChangeLog, 1.1450, 1.1451 configure.in, 1.104, 1.105

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        ChangeLog configure.in 
Log Message:


Modify the build system for "resources/en_US" to use the new
"csant" resource features.


Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/configure.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** configure.in        8 Nov 2003 01:54:49 -0000       1.104
--- configure.in        11 Nov 2003 07:30:47 -0000      1.105
***************
*** 129,132 ****
--- 129,169 ----
  fi
  
+ dnl Find the .NET resource generator to use.
+ if test "$MSTOOLS" = "no"; then
+       AC_PATH_PROG(RESGEN, resgen,, $PNET_PATH/resgen:${prefix}/bin:$PATH)
+       if test "$RESGEN" = "" ; then
+               echo 
'**************************************************************'
+               echo "Portable.NET's or Microsoft's resgen is required to 
build."
+               echo "Use the --with-pnet option to specify Portable.NET's 
location."
+               echo 
'**************************************************************'
+               exit 1
+       fi
+ else
+       AC_PATH_PROG(RESGEN, resgen)
+       if test "$RESGEN" = "" ; then
+               echo 
'***********************************************************'
+               echo "Could not locate Microsoft's resource utility 
(resgen.exe)."
+               echo 
'***********************************************************'
+               exit 1
+       fi
+ fi
+ 
+ dnl Find the Microsoft "al" assembly linker, for satellite resources.
+ if test "$MSTOOLS" = "yes"; then
+       AC_PATH_PROG(ASSEMBLY_LINKER, al)
+ else
+       ASSEMBLY_LINKER=pnet
+ fi
+ 
+ dnl Find the Portable.NET "ilgac" program.
+ AC_PATH_PROG(ILGAC, ilgac,, $PNET_PATH/ilgac:${prefix}/bin:$PATH)
+ if test "$ILGAC" = "" ; then
+       echo '**************************************************************'
+       echo "Portable.NET's ilgac tool is required to build the system."
+       echo "Use the --with-pnet option to specify Portable.NET's location."
+       echo '**************************************************************'
+       exit 1
+ fi
+ 
  dnl Find the C# compiler to use.
  if test "$MSTOOLS" = "no"; then
***************
*** 142,146 ****
                        exit 1
                fi
!               CSANT_FLAGS='--compiler csc -Dcsc="$(CSHARP_COMPILER)" 
--profile "$(top_srcdir)/profiles/$(PROFILE_NAME)"'
                CSHARP_COMPILER_CYGWIN="$CSHARP_COMPILER"
        else
--- 179,183 ----
                        exit 1
                fi
!               CSANT_FLAGS='--compiler csc -Dcsc="$(CSHARP_COMPILER)" 
--profile "$(top_srcdir)/profiles/$(PROFILE_NAME)" -Dresgen="$(RESGEN)" 
-Dilgac="$(ILGAC)" --assembly-cache "$(libdir)/cscc/lib"'
                CSHARP_COMPILER_CYGWIN="$CSHARP_COMPILER"
        else
***************
*** 155,159 ****
                        CSHARP_PLUGIN=`"$CYGPATH" -w "$CSHARP_PLUGIN"`
                fi
!               CSANT_FLAGS='--compiler cscc -Dcscc="$(CSHARP_COMPILER)" 
-Dcscc.plugins.cs="$(CSHARP_PLUGIN)" --profile 
"$(top_srcdir)/profiles/$(PROFILE_NAME)"'
        fi
  else
--- 192,196 ----
                        CSHARP_PLUGIN=`"$CYGPATH" -w "$CSHARP_PLUGIN"`
                fi
!               CSANT_FLAGS='--compiler cscc -Dcscc="$(CSHARP_COMPILER)" 
-Dcscc.plugins.cs="$(CSHARP_PLUGIN)" --profile 
"$(top_srcdir)/profiles/$(PROFILE_NAME)" -Dresgen="$(RESGEN)" 
-Dilgac="$(ILGAC)" --assembly-cache "$(libdir)/cscc/lib"'
        fi
  else
***************
*** 165,197 ****
                exit 1
        fi
!       CSANT_FLAGS='--compiler csc -Dcsc="$(CSHARP_COMPILER)" --profile 
"$(top_srcdir)/profiles/$(PROFILE_NAME)"'
        CSHARP_COMPILER_CYGWIN="$CSHARP_COMPILER"
- fi
- 
- dnl Find the .NET resource generator to use.
- if test "$MSTOOLS" = "no"; then
-       AC_PATH_PROG(RESGEN, resgen,, $PNET_PATH/resgen:${prefix}/bin:$PATH)
-       if test "$RESGEN" = "" ; then
-               echo 
'**************************************************************'
-               echo "Portable.NET's or Microsoft's resgen is required to 
build."
-               echo "Use the --with-pnet option to specify Portable.NET's 
location."
-               echo 
'**************************************************************'
-               exit 1
-       fi
- else
-       AC_PATH_PROG(RESGEN, resgen)
-       if test "$RESGEN" = "" ; then
-               echo 
'***********************************************************'
-               echo "Could not locate Microsoft's resource utility 
(resgen.exe)."
-               echo 
'***********************************************************'
-               exit 1
-       fi
- fi
- 
- dnl Find the Microsoft "al" assembly linker, for satellite resources.
- if test "$MSTOOLS" = "yes"; then
-       AC_PATH_PROG(ASSEMBLY_LINKER, al)
- else
-       ASSEMBLY_LINKER=pnet
  fi
  
--- 202,207 ----
                exit 1
        fi
!       CSANT_FLAGS='--compiler csc -Dcsc="$(CSHARP_COMPILER)" --profile 
"$(top_srcdir)/profiles/$(PROFILE_NAME)" -Dresgen="$(RESGEN)" 
-Dilgac="$(ILGAC)" --assembly-cache "$(libdir)/cscc/lib"'
        CSHARP_COMPILER_CYGWIN="$CSHARP_COMPILER"
  fi
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.1450
retrieving revision 1.1451
diff -C2 -d -r1.1450 -r1.1451
*** ChangeLog   9 Nov 2003 22:11:42 -0000       1.1450
--- ChangeLog   11 Nov 2003 07:30:47 -0000      1.1451
***************
*** 1,3 ****
--- 1,28 ----
  
+ 2003-11-11  Rhys Weatherley  <address@hidden>
+ 
+       * configure.in, resources/en_US/Basic/Makefile.am,
+       resources/en_US/Basic/resources.build,
+       resources/en_US/I18N/Makefile.am,
+       resources/en_US/I18N/resources.build,
+       resources/en_US/System/Makefile.am,
+       resources/en_US/System/resources.build,
+       resources/en_US/System.Configuration.Install/Makefile.am,
+       resources/en_US/System.Configuration.Install/resources.build,
+       resources/en_US/System.Drawing/Makefile.am,
+       resources/en_US/System.Drawing/resources.build,
+       resources/en_US/System.Net.IrDA/Makefile.am,
+       resources/en_US/System.Net.IrDA/resources.build,
+       resources/en_US/System.Windows.Forms/Makefile.am,
+       resources/en_US/System.Windows.Forms/resources.build,
+       resources/en_US/System.Xml/Makefile.am,
+       resources/en_US/System.Xml/resources.build,
+       resources/en_US/Xsharp/Makefile.am,
+       resources/en_US/Xsharp/Xsharp.txt,
+       resources/en_US/Xsharp/resources.build,
+       resources/en_US/runtime/Makefile.am,
+       resources/en_US/runtime/resources.build: modify the build system
+       for "resources/en_US" to use the new "csant" resource features.
+ 
  2003-11-10  Rhys Weatherley  <address@hidden>