You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mh...@apache.org on 2004/01/30 00:28:25 UTC
cvs commit: xml-xalan/c/Projects/Win32/VC6/Utils/Localization BuildMessages.mak Localization.dsp LocalizationWithICU.dsp Localization.mak
mhoyt 2004/01/29 15:28:25
Modified: c/Projects/Win32/VC6/Utils/Localization Localization.dsp
LocalizationWithICU.dsp
Added: c/Projects/Win32/VC6/Utils/Localization BuildMessages.mak
Removed: c/Projects/Win32/VC6/Utils/Localization Localization.mak
Log:
Rename Localization.mak to BuildMessages.mak to remove conflict with Localization.mak created when exporting makefiles.
PR: Bugzilla 26350
Submitted by: stajali@ca.ibm.com
Revision Changes Path
1.3 +12 -12 xml-xalan/c/Projects/Win32/VC6/Utils/Localization/Localization.dsp
Index: Localization.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/Utils/Localization/Localization.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Localization.dsp 29 Dec 2003 00:26:53 -0000 1.2
+++ Localization.dsp 29 Jan 2004 23:28:25 -0000 1.3
@@ -8,12 +8,12 @@
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "Localization.mak".
+!MESSAGE NMAKE /f "BuildMessages.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Localization.mak" CFG="Localization - Win32 Release"
+!MESSAGE NMAKE /f "BuildMessages.mak" CFG="Localization - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -33,11 +33,11 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Cmd_Line "NMAKE /f Localization.mak"
+# PROP BASE Cmd_Line "NMAKE /f BuildMessages.mak"
# PROP BASE Rebuild_Opt "/a"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Cmd_Line "nmake /f "Localization.mak" TYPE=inmem LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" TYPE=inmem LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "Localization"
@@ -45,11 +45,11 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Cmd_Line "NMAKE /f Localization.mak"
+# PROP BASE Cmd_Line "NMAKE /f BuildMessages.mak"
# PROP BASE Rebuild_Opt "/a"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Cmd_Line "nmake /f "Localization.mak" /NOLOGO CFG=Debug TYPE=inmem LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" /NOLOGO CFG=Debug TYPE=inmem LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "Localization"
@@ -57,13 +57,13 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Cmd_Line "nmake /f "Localization.mak" TYPE=inmem LOCALE=en_US"
+# PROP BASE Cmd_Line "nmake /f "BuildMessages.mak" TYPE=inmem LOCALE=en_US"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "Localization"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Cmd_Line "nmake /f "Localization.mak" TYPE=inmem CFG=Release.symbols LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" TYPE=inmem CFG=Release.symbols LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "Localization"
@@ -71,13 +71,13 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Cmd_Line "nmake /f "Localization.mak" TYPE=inmem LOCALE=en_US"
+# PROP BASE Cmd_Line "nmake /f "BuildMessages.mak" TYPE=inmem LOCALE=en_US"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "Localization"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Cmd_Line "nmake /f "Localization.mak" TYPE=inmem BITS=Win64 LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" TYPE=inmem BITS=Win64 LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "Localization"
@@ -85,13 +85,13 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Cmd_Line "nmake /f "Localization.mak" /NOLOGO CFG=Debug TYPE=inmem LOCALE=en_US"
+# PROP BASE Cmd_Line "nmake /f "BuildMessages.mak" /NOLOGO CFG=Debug TYPE=inmem LOCALE=en_US"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "Localization"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Cmd_Line "nmake /f "Localization.mak" /NOLOGO CFG=Debug TYPE=inmem BITS=Win64 LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" /NOLOGO CFG=Debug TYPE=inmem BITS=Win64 LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "Localization"
1.2 +12 -12 xml-xalan/c/Projects/Win32/VC6/Utils/Localization/LocalizationWithICU.dsp
Index: LocalizationWithICU.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/Utils/Localization/LocalizationWithICU.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalizationWithICU.dsp 8 Jan 2004 23:04:59 -0000 1.1
+++ LocalizationWithICU.dsp 29 Jan 2004 23:28:25 -0000 1.2
@@ -8,12 +8,12 @@
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "Localization.mak".
+!MESSAGE NMAKE /f "BuildMessages.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "Localization.mak" CFG="LocalizationWithICU - Win32 Release"
+!MESSAGE NMAKE /f "BuildMessages.mak" CFG="LocalizationWithICU - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -33,11 +33,11 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Cmd_Line "NMAKE /f Localization.mak"
+# PROP BASE Cmd_Line "NMAKE /f BuildMessages.mak"
# PROP BASE Rebuild_Opt "/a"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Cmd_Line "nmake /f "Localization.mak" TYPE=icu LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" TYPE=icu LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "LocalizationWithICU"
@@ -45,11 +45,11 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Cmd_Line "NMAKE /f Localization.mak"
+# PROP BASE Cmd_Line "NMAKE /f BuildMessages.mak"
# PROP BASE Rebuild_Opt "/a"
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Cmd_Line "nmake /f "Localization.mak" /NOLOGO CFG=Debug TYPE=icu LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" /NOLOGO CFG=Debug TYPE=icu LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "LocalizationWithICU"
@@ -57,13 +57,13 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Cmd_Line "nmake /f "Localization.mak" TYPE=icu LOCALE=en_US"
+# PROP BASE Cmd_Line "nmake /f "BuildMessages.mak" TYPE=icu LOCALE=en_US"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "LocalizationWithICU"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Cmd_Line "nmake /f "Localization.mak" TYPE=icu CFG=Release.symbols LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" TYPE=icu CFG=Release.symbols LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "LocalizationWithICU"
@@ -71,13 +71,13 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Cmd_Line "nmake /f "Localization.mak" TYPE=icu LOCALE=en_US"
+# PROP BASE Cmd_Line "nmake /f "BuildMessages.mak" TYPE=icu LOCALE=en_US"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "LocalizationWithICU"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Cmd_Line "nmake /f "Localization.mak" TYPE=icu BITS=Win64 LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" TYPE=icu BITS=Win64 LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "LocalizationWithICU"
@@ -85,13 +85,13 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Cmd_Line "nmake /f "Localization.mak" /NOLOGO CFG=Debug TYPE=icu LOCALE=en_US"
+# PROP BASE Cmd_Line "nmake /f "BuildMessages.mak" /NOLOGO CFG=Debug TYPE=icu LOCALE=en_US"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "LocalizationWithICU"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Cmd_Line "nmake /f "Localization.mak" /NOLOGO CFG=Debug TYPE=icu BITS=Win64 LOCALE=en_US"
+# PROP Cmd_Line "nmake /f "BuildMessages.mak" /NOLOGO CFG=Debug TYPE=icu BITS=Win64 LOCALE=en_US"
# PROP Rebuild_Opt "/a"
# PROP Target_File "LocalizationWithICU"
1.1 xml-xalan/c/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak
Index: BuildMessages.mak
===================================================================
# This makefike requires Tools.ini file with settings
# Check parameters:
# Should be defined:
# LOCALE, in form of "en" or "en_US"
# TYPE, possible values are "inmem" and "icu"
!IF "$(BITS)" != "Win32" && "$(BITS)" != "Win64"
! ERROR Invalid configuration BITS="$(BITS)" specified.
!ELSE
!MESSAGE Used BITS = $(BITS)
!ENDIF
!IF "$(CFG)" != "Debug" && "$(CFG)" != "Release" && "$(CFG)" != "Release.symbols"
! ERROR Invalid configuration CFG="$(CFG)" specified.
!ELSE
!MESSAGE Used CFG = $(CFG)
!ENDIF
!IF "$(LOCALE)" == ""
! MESSAGE Locale is not defined. The locale can be defined in the command line or in Tools.ini file
! ERROR Locale must be defined
!ELSE
! MESSAGE Used LOCALE = $(LOCALE)
!ENDIF
!IF "$(TYPE)" == ""
! ERROR Localization type must be defined.Possible values are "inmem" and "icu"
!ENDIF
!IF "$(TYPE)" != "inmem" && "$(TYPE)" != "icu"
! ERROR Invalid configuration TYPE="$(TYPE)" specified.
!ELSE
! MESSAGE Used TYPE = $(TYPE)
!ENDIF
!IF "$(TYPE)" == "icu" && "$(ICUROOT)"==""
!ERROR Please define ICUROOT in xml-xalan\c\Projects\Win32\VC6\Utils\Localization\tools.ini file
!ENDIF
!IF EXIST ($(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT))
! MESSAGE Used XLIFF file: "$(MSGFILENAME)$(LOCALE)$(XIFFEXT)"
!ELSE
! ERROR File "$(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT)" is required
!ENDIF
include ..\..\..\..\..\version.incl
#== Commmon tools
MKDIR=mkdir
MOVE=move
!IF "$(CFG)" == "Debug"
PKGNAME=$(LIBNAME)_$(VER)D
!ELSEIF "$(CFG)" == "Release.symbols"
PKGNAME=$(LIBNAME)_$(VER)S
!ELSE
PKGNAME=$(LIBNAME)_$(VER)
!ENDIF
#====================== INMEM part =================================================================
!IF "$(TYPE)" == "inmem"
ALL : PREPARE $(TMPINCLUDESDIR)\LocalMsgData.hpp $(OUTPUTDIR)\$(PKGNAME).dll
$(OUTPUTDIR)\$(PKGNAME).dll : $(TMPINCLUDESDIR)\LocalMsgData.hpp
$(MAKE) /$(MAKEFLAGS) /NOLOGO /f ..\XalanMsgLib\XalanMsgLib.mak CFG="XalanMsgLib - $(BITS) $(CFG)" DLLNAME=$(PKGNAME) $(MAKE_PARAMS)
$(TMPINCLUDESDIR)\LocalMsgData.hpp : $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT)
@if not exist $(OUTPUTDIR)\MsgCreator.exe ( $(MAKE) /f ..\MsgCreator\MsgCreator.mak CFG="MsgCreator - $(BITS) $(CFG)" $(MAKE_PARAMS))
$(OUTPUTDIR)\MsgCreator.exe $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT) -TYPE $(TYPE) -LOCALE $(LOCALE)
@$(MOVE) LocalMsgIndex.hpp $(TMPINCLUDESDIR)
@$(MOVE) LocalMsgData.hpp $(TMPINCLUDESDIR)
PREPARE:
@if not exist $(TMPINCLUDESDIR) ( $(MKDIR) $(TMPINCLUDESDIR) )
#====================== End of INMEM part =============================================================
#====================== ICU part ======================================================================
!ELSEIF "$(TYPE)" == "icu"
GENRB = genrb.exe
PKGDATA = pkgdata.exe
ALL : PREPARE $(INTDIR)\Icu\$(LOCALE).txt $(OUTPUTDIR)\$(PKGNAME).dll
$(OUTPUTDIR)\$(PKGNAME).dll : $(INTDIR)\Icu\$(LOCALE).txt
$(GENRB) --package-name $(PKGNAME) -d $(INTDIR)\Icu $(INTDIR)\Icu\$(LOCALE).txt
echo $(INTDIR)\Icu\$(PKGNAME)_$(LOCALE).res > $(INTDIR)\Icu\res-file-list.txt
$(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v -O R:$(ICUROOT) --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
$(INTDIR)\Icu\$(LOCALE).txt : $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT)
if not exist $(OUTPUTDIR)\MsgCreator.exe ( $(MAKE) /f ..\MsgCreator\MsgCreator.mak CFG="MsgCreator - $(BITS) $(CFG)" $(MAKE_PARAMS))
$(OUTPUTDIR)\MsgCreator.exe $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT) -TYPE $(TYPE) -LOCALE $(LOCALE)
@$(MOVE) LocalMsgIndex.hpp $(TMPINCLUDESDIR)
@$(MOVE) $(LOCALE).txt $(INTDIR)\Icu
PREPARE:
@if not exist $(INTDIR)\Icu ( $(MKDIR) $(INTDIR)\Icu )
@if not exist $(TMPINCLUDESDIR) ( $(MKDIR) $(TMPINCLUDESDIR) )
#====================== End of ICU part ==================================================================
!ENDIF
#====================== Commom part =================================================================
CLEAN :
$(MAKE) /f ..\MsgCreator\MsgCreator.mak CFG="MsgCreator - $(BITS) $(CFG)" CLEAN
$(MAKE) /NOLOGO /f ..\XalanMsgLib\XalanMsgLib.mak CFG="XalanMsgLib - $(BITS) $(CFG)" CLEAN
-@erase $(TMPINCLUDESDIR)\XalanMsgIndex.hpp
-@erase $(TMPINCLUDESDIR)\LocalMsgData.hpp
!IF "$(TYPE)" == "icu"
$(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v -O R:$(ICUROOT) -k --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
!ENDIF
-@erase $(INTDIR)\Icu\$(LOCALE).txt
-@del $(NLSDIR)\ICU\$(PKGNAME)_$(LOCALE).res
-@erase $(INTDIR)\Icu\res-file-list.txt
-@erase $(OUTPUTDIR)\$(PKGNAME)*
PREPARE:
#====================== End of commom part ==========================================================
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org