Commit [9def0b] Maximize Restore History

Updating Windows Makefiles to match new build tree. WiP (installers still not done)

git-svn-id: svn://svn.code.sf.net/p/passwordsafe/code/trunk/pwsafe/pwsafe@2838 1f79f812-37fb-46fe-a122-30589dd2bf55

Rony Shapiro Rony Shapiro 2009-08-18

changed src/Tools/Windows/I18N/Makefile
changed src/ui/Windows/I18N/pos/pwsafe_de.po
changed src/ui/Windows/I18N/pos/pwsafe_es.po
changed src/ui/Windows/I18N/pos/pwsafe_it.po
changed src/ui/Windows/I18N/pos/pwsafe_pl.po
changed src/ui/Windows/I18N/pos/pwsafe_ru.po
changed src/ui/Windows/I18N/pos/pwsafe_sv.po
changed src/ui/Windows/I18N/pos/pwsafe_zh.po
changed Makefile.windows
copied src/Tools/Windows/I18N/Makefile.CreateDLLs -> src/ui/Windows/I18N/Makefile
src/Tools/Windows/I18N/Makefile Diff Switch to side-by-side view
Loading...
src/ui/Windows/I18N/pos/pwsafe_de.po Diff Switch to side-by-side view
Loading...
src/ui/Windows/I18N/pos/pwsafe_es.po Diff Switch to side-by-side view
Loading...
src/ui/Windows/I18N/pos/pwsafe_it.po Diff Switch to side-by-side view
Loading...
src/ui/Windows/I18N/pos/pwsafe_pl.po Diff Switch to side-by-side view
Loading...
src/ui/Windows/I18N/pos/pwsafe_ru.po Diff Switch to side-by-side view
Loading...
src/ui/Windows/I18N/pos/pwsafe_sv.po Diff Switch to side-by-side view
Loading...
src/ui/Windows/I18N/pos/pwsafe_zh.po Diff Switch to side-by-side view
Loading...
Makefile.windows Diff Switch to side-by-side view
Loading...
src/Tools/Windows/I18N/Makefile.CreateDLLs to src/ui/Windows/I18N/Makefile
--- a/src/Tools/Windows/I18N/Makefile.CreateDLLs
+++ b/src/ui/Windows/I18N/Makefile
@@ -22,8 +22,11 @@
 DLL_LIST = pwsafeSV.dll pwsafeES.dll pwsafeDE.dll \
 	pwsafePL.dll pwsafeZH.dll pwsafeRU.dll pwsafeIT.dll
 
-DEST_DIR = ../../../bin/release
+DEST_DIR = ../../../../build/bin/pwsafe/I18N
 DLLS = $(DLL_LIST:%=$(DEST_DIR)/%)
+
+TOOLS_SRC_DIR = ../../../Tools/Windows/I18N
+TOOLS_BIN_DIR = ../../../../build/bin
 
 help:
 	@echo "Make one of:"
@@ -34,66 +37,57 @@
 # I'm sure that we can improve on this...
 
 $(DEST_DIR)/pwsafeSV.dll : pos/pwsafe_sv.po
-	(cd $(DEST_DIR); \
- 	 $(RESTEXT) apply $(notdir $(BASE_DLL)) foo.dll ../../ui/Windows/I18N/$^; \
-	 $(RESPWSL) apply foo.dll 0x041d; \
-	 $(RM) foo.dll; $(MV) pwsafeSV_SE.dll pwsafeSV.dll)
+	$(RESTEXT) apply $(BASE_DLL) foo.dll ./$^; \
+	$(RESPWSL) apply foo.dll 0x041d; \
+	$(RM) foo.dll; $(MV) pwsafeSV_SE.dll $(DEST_DIR)/pwsafeSV.dll
 	$(CHMOD) 755 $@
 
 $(DEST_DIR)/pwsafeES.dll : pos/pwsafe_es.po
-	(cd $(DEST_DIR); \
-		$(RESTEXT) apply $(notdir $(BASE_DLL)) foo.dll ../../ui/Windows/I18N/$^; \
-		$(RESPWSL) apply foo.dll 0x0c0a; \
-		$(RM) foo.dll; $(MV) pwsafeES_ES.dll pwsafeES.dll)
+	$(RESTEXT) apply $(BASE_DLL) foo.dll ./$^; \
+	$(RESPWSL) apply foo.dll 0x0c0a; \
+	$(RM) foo.dll; $(MV) pwsafeES_ES.dll $(DEST_DIR)/pwsafeES.dll
 	$(CHMOD) 755 $@
 
 $(DEST_DIR)/pwsafeDE.dll : pos/pwsafe_de.po
-	(cd $(DEST_DIR); \
-		$(RESTEXT) apply $(notdir $(BASE_DLL)) foo.dll ../../ui/Windows/I18N/$^; \
-		$(RESPWSL) apply foo.dll 0x0407; \
-		$(RM) foo.dll; $(MV) pwsafeDE_DE.dll pwsafeDE.dll)
+	$(RESTEXT) apply $(BASE_DLL) foo.dll ./$^; \
+	$(RESPWSL) apply foo.dll 0x0407; \
+	$(RM) foo.dll; $(MV) pwsafeDE_DE.dll $(DEST_DIR)/pwsafeDE.dll
 	$(CHMOD) 755 $@
 
 $(DEST_DIR)/pwsafePL.dll : pos/pwsafe_pl.po
-	(cd $(DEST_DIR); \
-		$(RESTEXT) apply $(notdir $(BASE_DLL)) foo.dll ../../ui/Windows/I18N/$^; \
-		$(RESPWSL) apply foo.dll 0x0415; \
-		$(RM) foo.dll; $(MV) pwsafePL_PL.dll pwsafePL.dll)
+	$(RESTEXT) apply $(BASE_DLL) foo.dll ./$^; \
+	$(RESPWSL) apply foo.dll 0x0415; \
+	$(RM) foo.dll; $(MV) pwsafePL_PL.dll $(DEST_DIR)/pwsafePL.dll
 	$(CHMOD) 755 $@
 
 $(DEST_DIR)/pwsafeZH.dll : pos/pwsafe_zh.po
-	(cd $(DEST_DIR); \
-		$(RESTEXT) apply $(notdir $(BASE_DLL)) foo.dll ../../ui/Windows/I18N/$^; \
-		$(RESPWSL) apply foo.dll 0x0804; \
-		$(RM) foo.dll; $(MV) pwsafeZH_CN.dll pwsafeZH.dll)
+	$(RESTEXT) apply $(BASE_DLL) foo.dll ./$^; \
+	$(RESPWSL) apply foo.dll 0x0804; \
+	$(RM) foo.dll; $(MV) pwsafeZH_CN.dll $(DEST_DIR)/pwsafeZH.dll
 	$(CHMOD) 755 $@
 
 $(DEST_DIR)/pwsafeRU.dll : pos/pwsafe_ru.po
-	(cd $(DEST_DIR); \
-		$(RESTEXT) apply $(notdir $(BASE_DLL)) foo.dll ../../ui/Windows/I18N/$^; \
-		$(RESPWSL) apply foo.dll 0x0419; \
-		$(RM) foo.dll; $(MV) pwsafeRU_RU.dll pwsafeRU.dll)
+	$(RESTEXT) apply $(BASE_DLL) foo.dll ./$^; \
+	$(RESPWSL) apply foo.dll 0x0419; \
+	$(RM) foo.dll; $(MV) pwsafeRU_RU.dll $(DEST_DIR)/pwsafeRU.dll
 	$(CHMOD) 755 $@
 
 $(DEST_DIR)/pwsafeIT.dll : pos/pwsafe_it.po
-	(cd $(DEST_DIR); \
-		$(RESTEXT) apply $(notdir $(BASE_DLL)) foo.dll ../../ui/Windows/I18N/$^; \
-		$(RESPWSL) apply foo.dll 0x0410; \
-		$(RM) foo.dll; $(MV) pwsafeIT_IT.dll pwsafeIT.dll)
+	$(RESTEXT) apply $(BASE_DLL) foo.dll ./$^; \
+	$(RESPWSL) apply foo.dll 0x0410; \
+	$(RM) foo.dll; $(MV) pwsafeIT_IT.dll $(DEST_DIR)/pwsafeIT.dll
 	$(CHMOD) 755 $@
 
 # No need to change anything below this line
-export RESTEXT = $(CURDIR)/tools/bin/restext/release/ResText.exe
-export RESPWSL = $(CURDIR)/tools/bin/respwsl/release/ResPWSL.exe
+RESTEXT = $(TOOLS_BIN_DIR)/restext/release/ResText.exe
+RESPWSL = $(TOOLS_BIN_DIR)/respwsl/release/ResPWSL.exe
 CHMOD = /usr/bin/chmod
 RM = /usr/bin/rm
 MV = /usr/bin/mv
-VCBUILD = /cygdrive/c/local/MSVS8/vc/vcpackages/vcbuild.exe
 
-BASE_DLL = $(DEST_DIR)/pwsafe_base.dll
+BASE_DLL = ../../../../build/bin/pwsafe/release/pwsafe_base.dll
 
-
-.PHONY: update-pos dlls tools clean help
+.PHONY: update-pos dlls tools clean help dest_dir
 
 update-pos: tools $(POS)
 
@@ -105,17 +99,13 @@
 pwsafe.pot: tools $(BASE_DLL)
 	$(RESTEXT) extract -noupdate $(BASE_DLL) $@
 
-dlls : $(DLLS)
+dest_dir :
+	@mkdir -p $(DEST_DIR)
+
+dlls : dest_dir $(DLLS)
 
 tools : 
-	$(MAKE) -C tools
+	$(MAKE) -C $(TOOLS_SRC_DIR)
 
 clean :
-	$(MAKE) -C tools clean
-
-$(RESTEXT) :
-	(cd tools/ResText; $(VCBUILD) ResText.sln Release\|Win32)
-
-$(RESPWSL) :
-	(cd tools/ResPWSL; $(VCBUILD) ResPWSL.sln Release\|Win32)
-
+	$(MAKE) -C $(TOOLS_SRC_DIR) clean