svn commit: r900717 - in /commons/sandbox/runtime/trunk/src/main/native: Makefile.msc.in support/win32/support.rc support/win32/wsuexec.c

[mturk]

Author: mturk
Date: Tue Jan 19 10:18:36 2010
New Revision: 900717

URL: http://svn.apache.org/viewvc?rev=900717&view=rev
Log:
Update support make

Modified:
    commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
    commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc
    commons/sandbox/runtime/trunk/src/main/native/support/win32/wsuexec.c

Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=900717&r1=900716&r2=900717&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Tue Jan 19 
10:18:36 2010
@@ -251,6 +251,9 @@
 {$(SRCDIR)\srclib\zlib}.c{$(SRCDIR)\srclib\zlib}.$(OBJ):
        $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES) 
-c -Fo$@ -Fd$(LIBNAME)-src $<
 
+{$(SRCDIR)\support\win32}.c{$(SRCDIR)\support\win32}.$(OBJ):
+       $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) $(INCLUDES) -c -Fo$@ 
-Fdwtools-src $<
+
 {$(SRCDIR)\test}.c{$(SRCDIR)\test}.$(OBJ):
        $(CC) $(CFLAGS) $(CSFLAGS) $(CPPFLAGS) -DACR_DECLARE_EXPORT $(INCLUDES) 
-c -Fo$@ -Fd$(LIBNAME)-src $<
 
@@ -289,7 +292,7 @@
                mt -nologo -manifest $...@.manifest -outputresource:$@;2
 
 $(WINSUEXEC):  $(SRCDIR)/support/win32/wsuexec.$(OBJ)
-       $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="\"Apache Commons Runtime 
suEXEC\"" /d STR_INTNAME="\"wsuexec\"" /i "$(SRCDIR)\support\win32" /i 
"$(SRCDIR)\include" /fo $...@.res $(SRCDIR)/support/win32/support.rc
+       $(RC) /l 0x409 /d "NDEBUG" /d STR_PRODUCT="\"Apache Commons Runtime 
suEXEC\"" /d STR_INTNAME="\"wsuexec\"" /i "$(SRCDIR)\support\win32" /i 
"$(SRCDIR)\os\win32" /i "$(SRCDIR)\include" /fo $...@.res 
$(SRCDIR)/support/win32/support.rc
        $(LINK) $(SHFLAGS) /SUBSYSTEM:WINDOWS $(LDFLAGS) /pdb:wsuexec.pdb 
/out:$@ @<<
        $(SRCDIR)/support/win32/wsuexec.$(OBJ) $...@.res
 <<
@@ -327,6 +330,7 @@
        -...@del /Q *.exp  2>NUL
        -...@del /Q *.res  2>NUL
        -...@del /Q *.exe  2>NUL
+       -...@del /Q *.manifest  2>NUL
 
 distclean: clean
        -...@del /Q $(TOPDIR)\Makefile 2>NUL

Modified: commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc?rev=900717&r1=900716&r2=900717&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc 
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc Tue 
Jan 19 10:18:36 2010
@@ -18,6 +18,9 @@
 #include <windows.h>
 #include "acr_version.h"
 
+LANGUAGE 0x9,0x1
+1 11 logmessages.bin
+
 #define STR_LICENSE \
   "Licensed under the Apache License, Version 2.0 (the ""License""); "         
\
   "you may not use this file except in compliance with the License. "          
\
@@ -74,7 +77,7 @@
 #define IDI_MAINICON 101
 
 IDI_MAINICON         ICON                       "apache.ico"
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST  "support.manifest"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST  "commonc.manifest"
 
 1 VERSIONINFO
  FILEVERSION ACR_VERSION_STRING_CSV

Modified: commons/sandbox/runtime/trunk/src/main/native/support/win32/wsuexec.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/support/win32/wsuexec.c?rev=900717&r1=900716&r2=900717&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/support/win32/wsuexec.c 
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/support/win32/wsuexec.c Tue 
Jan 19 10:18:36 2010
@@ -458,9 +458,9 @@
                 argument = wcsdup(params[argidx++]);
                 for (; argidx < nparams; argidx++) {
                     wchar_t *as = malloc((wcslen(argument) + 
wcslen(params[argidx]) + 2) * sizeof(wchar_t));
-                    wcscpy(part, argument);
-                    wcscat(part, L" ");
-                    wcscat(part, params[argidx]);
+                    wcscpy(as, argument);
+                    wcscat(as, L" ");
+                    wcscat(as, params[argidx]);
                     free(argument);
                     argument = as;
                 }