You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2007/12/31 03:13:03 UTC
svn commit: r607651 - in
/xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32:
VC6/Utils/Localization/BuildMessages.mak
VC7.1/Utils/Localization/BuildMessages.mak
VC7/Utils/Localization/BuildMessages.mak
Author: dbertoni
Date: Sun Dec 30 18:12:59 2007
New Revision: 607651
URL: http://svn.apache.org/viewvc?rev=607651&view=rev
Log:
Fixed some makefile issues.
Modified:
xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak
xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7.1/Utils/Localization/BuildMessages.mak
xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7/Utils/Localization/BuildMessages.mak
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak?rev=607651&r1=607650&r2=607651&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak Sun Dec 30 18:12:59 2007
@@ -77,8 +77,8 @@
PKGNAME=$(LIBNAME)_$(MS_VER)
!ENDIF
-XERCESPATH=$(XERCESCROOT)/bin;$(XERCESCROOT)\Build\Win32\VC6\Release;$(XERCESCROOT)\Build\Win32\VC6\Debug;$(XERCESCROOT)\Build\Win64\VC6\Release;$(XERCESCROOT)\Build\Win64\VC6\Debug
-ICUPATH=$(ICUROOT)/bin
+XERCESPATH=$(XERCESCROOT)\bin;$(XERCESCROOT)\Build\Win32\VC6\Release;$(XERCESCROOT)\Build\Win32\VC6\Debug;$(XERCESCROOT)\Build\Win64\VC6\Release;$(XERCESCROOT)\Build\Win64\VC6\Debug
+ICUPATH=$(ICUROOT)\bin
#====================== INMEM part =================================================================
@@ -93,7 +93,7 @@
$(TMPINCLUDESDIR)\LocalMsgData.hpp : $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT)
- @set PATH=$(PATH);$(XERCESPATH)
+ @set PATH=$(ICUPATH);$(XERCESPATH);$(PATH)
@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)
@@ -118,14 +118,13 @@
$(OUTPUTDIR)\$(PKGNAME).dll : $(INTDIR)\Icu\$(LOCALE).txt
- @set PATH=$(PATH);$(ICUPATH)
- $(GENRB) --package-name $(PKGNAME) -d $(INTDIR)\Icu $(INTDIR)\Icu\$(LOCALE).txt
+ $(ICUPATH)\$(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
+ $(ICUPATH)\$(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
$(INTDIR)\Icu\$(LOCALE).txt : $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT)
- @set PATH=$(PATH);$(XERCESPATH)
+ @set PATH=$(ICUPATH);$(XERCESPATH);$(PATH)
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)
@@ -145,8 +144,7 @@
-@erase $(TMPINCLUDESDIR)\XalanMsgIndex.hpp
-@erase $(TMPINCLUDESDIR)\LocalMsgData.hpp
!IF "$(TYPE)" == "icu"
- @set PATH=$(PATH);$(ICUPATH)
- $(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v -O R:$(ICUROOT) -k --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
+ $(ICUPATH)\$(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v -k --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
!ENDIF
-@erase $(INTDIR)\Icu\$(LOCALE).txt
-@del $(NLSDIR)\ICU\$(PKGNAME)_$(LOCALE).res
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7.1/Utils/Localization/BuildMessages.mak
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7.1/Utils/Localization/BuildMessages.mak?rev=607651&r1=607650&r2=607651&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7.1/Utils/Localization/BuildMessages.mak (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7.1/Utils/Localization/BuildMessages.mak Sun Dec 30 18:12:59 2007
@@ -77,8 +77,8 @@
PKGNAME=$(LIBNAME)_$(MS_VER)
!ENDIF
-XERCESPATH=$(XERCESCROOT)/bin;$(XERCESCROOT)\Build\Win32\VC7.1\Release;$(XERCESCROOT)\Build\Win32\VC7.1\Debug;$(XERCESCROOT)\Build\Win64\VC7.1\Release;$(XERCESCROOT)\Build\Win64\VC7.1\Debug
-ICUPATH=$(ICUROOT)/bin
+XERCESPATH=$(XERCESCROOT)\bin;$(XERCESCROOT)\Build\Win32\VC7.1\Release;$(XERCESCROOT)\Build\Win32\VC7.1\Debug;$(XERCESCROOT)\Build\Win64\VC7.1\Release;$(XERCESCROOT)\Build\Win64\VC7.1\Debug
+ICUPATH=$(ICUROOT)\bin
#====================== INMEM part =================================================================
@@ -93,7 +93,7 @@
$(TMPINCLUDESDIR)\LocalMsgData.hpp : $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT)
- @set PATH=$(PATH);$(XERCESPATH)
+ @set PATH=$(ICUPATH);$(XERCESPATH);$(PATH)
@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)
@@ -118,14 +118,13 @@
$(OUTPUTDIR)\$(PKGNAME).dll : $(INTDIR)\Icu\$(LOCALE).txt
- @set PATH=$(PATH);$(ICUPATH)
- $(GENRB) --package-name $(PKGNAME) -d $(INTDIR)\Icu $(INTDIR)\Icu\$(LOCALE).txt
+ $(ICUPATH)\$(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
+ $(ICUPATH)\$(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
$(INTDIR)\Icu\$(LOCALE).txt : $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT)
- @set PATH=$(PATH);$(XERCESPATH)
+ @set PATH=$(ICUPATH);$(XERCESPATH);$(PATH)
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)
@@ -145,8 +144,7 @@
-@erase $(TMPINCLUDESDIR)\XalanMsgIndex.hpp
-@erase $(TMPINCLUDESDIR)\LocalMsgData.hpp
!IF "$(TYPE)" == "icu"
- @set PATH=$(PATH);$(ICUPATH)
- $(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v -O R:$(ICUROOT) -k --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
+ $(ICUPATH)\$(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v -k --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
!ENDIF
-@erase $(INTDIR)\Icu\$(LOCALE).txt
-@del $(NLSDIR)\ICU\$(PKGNAME)_$(LOCALE).res
Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7/Utils/Localization/BuildMessages.mak
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7/Utils/Localization/BuildMessages.mak?rev=607651&r1=607650&r2=607651&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7/Utils/Localization/BuildMessages.mak (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC7/Utils/Localization/BuildMessages.mak Sun Dec 30 18:12:59 2007
@@ -77,8 +77,8 @@
PKGNAME=$(LIBNAME)_$(MS_VER)
!ENDIF
-XERCESPATH=$(XERCESCROOT)/bin;$(XERCESCROOT)\Build\Win32\VC7\Release;$(XERCESCROOT)\Build\Win32\VC7\Debug;$(XERCESCROOT)\Build\Win64\VC7\Release;$(XERCESCROOT)\Build\Win64\VC7\Debug
-ICUPATH=$(ICUROOT)/bin
+XERCESPATH=$(XERCESCROOT)\bin;$(XERCESCROOT)\Build\Win32\VC7\Release;$(XERCESCROOT)\Build\Win32\VC7\Debug;$(XERCESCROOT)\Build\Win64\VC7\Release;$(XERCESCROOT)\Build\Win64\VC7\Debug
+ICUPATH=$(ICUROOT)\bin
#====================== INMEM part =================================================================
@@ -93,7 +93,7 @@
$(TMPINCLUDESDIR)\LocalMsgData.hpp : $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT)
- @set PATH=$(PATH);$(XERCESPATH)
+ @set PATH=$(ICUPATH);$(XERCESPATH);$(PATH)
@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)
@@ -118,14 +118,13 @@
$(OUTPUTDIR)\$(PKGNAME).dll : $(INTDIR)\Icu\$(LOCALE).txt
- @set PATH=$(PATH);$(ICUPATH)
- $(GENRB) --package-name $(PKGNAME) -d $(INTDIR)\Icu $(INTDIR)\Icu\$(LOCALE).txt
+ $(ICUPATH)\$(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
+ $(ICUPATH)\$(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
$(INTDIR)\Icu\$(LOCALE).txt : $(NLSDIR)\$(LOCALE)\$(MSGFILENAME)$(LOCALE)$(XIFFEXT)
- @set PATH=$(PATH);$(XERCESPATH)
+ @set PATH=$(ICUPATH);$(XERCESPATH);$(PATH)
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)
@@ -145,8 +144,7 @@
-@erase $(TMPINCLUDESDIR)\XalanMsgIndex.hpp
-@erase $(TMPINCLUDESDIR)\LocalMsgData.hpp
!IF "$(TYPE)" == "icu"
- @set PATH=$(PATH);$(ICUPATH)
- $(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v -O R:$(ICUROOT) -k --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
+ $(ICUPATH)\$(PKGDATA) --name $(PKGNAME) -T $(INTDIR)\Icu -v -k --mode dll -d $(OUTPUTDIR) $(INTDIR)\Icu\res-file-list.txt
!ENDIF
-@erase $(INTDIR)\Icu\$(LOCALE).txt
-@del $(NLSDIR)\ICU\$(PKGNAME)_$(LOCALE).res
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org