Author: mturk
Date: Sat May 23 09:52:11 2009
New Revision: 777878
URL: http://svn.apache.org/viewvc?rev=777878&view=rev
Log:
Make .rc file reusable between modules
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc
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=777878&r1=777877&r2=777878&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Sat May 23
09:52:11 2009
@@ -88,8 +88,7 @@
$(SRCDIR)/os/win32/group.$(OBJ) \
$(SRCDIR)/os/win32/user.$(OBJ) \
$(SRCDIR)/os/win32/uuid.$(OBJ) \
- $(SRCDIR)/os/win32/wusec.$(OBJ) \
- $(SRCDIR)/os/win32/main.res
+ $(SRCDIR)/os/win32/wusec.$(OBJ)
TEST_OBJS= \
$(SRCDIR)/test/testcase.$(OBJ)
@@ -111,20 +110,19 @@
{$(SRCDIR)\os\win32}.cpp{$(SRCDIR)\os\win32}.$(OBJ):
$(CXX) $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES) -c -Fo$@
-Fd$(LIBNAME)-src $<
-.rc.res:
- $(RC) /l 0x409 /d "NDEBUG" /i "$(SRCDIR)\include" /fo $@ $<
-
$(SHAREDLIB): $(COMMON_OBJS) $(@platf...@_objs) @testobjs@
+ $(RC) /l 0x409 /d "NDEBUG" /i "$(SRCDIR)\include" /fo $...@.res
$(SRCDIR)/os/win32/main.rc
$(LINK) $(SHFLAGS) $(LDFLAGS) /DLL /SUBSYSTEM:WINDOWS
/pdb:$(LIBNAME).pdb /out:$@ @<<
- $(COMMON_OBJS) $(WINDOWS_OBJS) @testobjs@
+ $(COMMON_OBJS) $(WINDOWS_OBJS) @testobjs@ $...@.res
<<
IF EXIST $...@.manifest \
mt -nologo -manifest $...@.manifest -outputresource:$@;2
@copy /Y $@ $(LIBSO)
$(SSLMODLIB): $(SHAREDLIB) $(OPENSSL_OBJS)
+ $(RC) /l 0x409 /d "NDEBUG" /d SRC_INTNAME="$(SSLNAME)" /d
STR_PRODUCT="Apache Commons Runtime SSL Module" /i "$(SRCDIR)\include" /fo
$...@.res $(SRCDIR)/os/win32/main.rc
$(LINK) $(SHFLAGS) $(LDFLAGS) $(SSLFLAGS) /DLL /SUBSYSTEM:WINDOWS
libpath:"." $(LIBNAME).lib /pdb:$(SSLNAME).pdb /out:$@ @<<
- $(OPENSSL_OBJS)
+ $(OPENSSL_OBJS) $...@.res
<<
IF EXIST $(SSLMODLIB).manifest \
mt -nologo -manifest $...@.manifest -outputresource:$@;2
@@ -140,6 +138,7 @@
-...@del /Q *.lib 2>NUL
-...@del /Q *.pdb 2>NUL
-...@del /Q *.exp 2>NUL
+ -...@del /Q *.res 2>NUL
distclean: clean
-...@del /Q $(TOPDIR)\Makefile 2>NUL
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc?rev=777878&r1=777877&r2=777878&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/main.rc Sat May 23
09:52:11 2009
@@ -41,10 +41,18 @@
#define STR_COMPANY "Apache Software Foundation"
#define STR_TRADEMARK " Apache Software Foundation"
+#ifndef STR_PRODUCT
#define STR_PRODUCT "Apache Commons Runtime"
+#endif
+#ifndef STR_INTNAME
+#define STR_INTNAME "libacr"
+#endif
+#ifndef STR_BINNAME
+#define STR_BINNAME STR_INTNAME ".dll"
+#endif
-#define PRIVATE_BUILD 1
-#define PRERELEASE_BUILD 1
+#define PRIVATE_BUILD ACR_IS_DEV_VERSION
+#define PRERELEASE_BUILD ACR_IS_DEV_VERSION
#if PRIVATE_BUILD
#define STR_PRIVATE "Initial Prerelease"
@@ -54,7 +62,7 @@
#define STD_FILEFLAGS 0x0L
#endif
-#if RERELEASE_BUILD
+#if PRERELEASE_BUILD
#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE
#else
#define PSTD_FILEFLAGS STD_FILEFLAGS
@@ -86,10 +94,10 @@
VALUE "CompanyName", STR_COMPANY "\0"
VALUE "FileDescription", STR_PRODUCT "\0"
VALUE "FileVersion", ACR_VERSION_STRING "\0"
- VALUE "InternalName", "libacr"
+ VALUE "InternalName", STR_INTNAME "\0"
VALUE "LegalCopyright", STR_COPYRIGHT "\0"
VALUE "LegalTrademarks", STR_TRADEMARK "\0"
- VALUE "OriginalFilename", "libacr.dll"
+ VALUE "OriginalFilename", STR_BINNAME "\0"
VALUE "ProductName", STR_PRODUCT "\0"
VALUE "ProductVersion", ACR_VERSION_STRING "\0"
#if PRIVATE_BUILD
