windows ce build tools update r=dougt
authorBrad Lassey <blassey@mozilla.com>
Mon, 20 Oct 2008 16:15:40 -0400
changeset 20682 81e9c4b9525bdeee471f1c58c4c778ef82c58ce6
parent 20681 2fccc2d253e25508871fb95c6db9e5b706966dd4
child 20683 457619abbaa5f2197064cc99f751b977a6d15084
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougt
milestone1.9.1b2pre
windows ce build tools update r=dougt
build/wince/tools/Makefile
build/wince/tools/vs8ppc2003arm/toolspath.h
build/wince/tools/vs9ppc2003arm/arm-wince-res.c
build/wince/tools/vs9ppc2003arm/toolspath.h
--- a/build/wince/tools/Makefile
+++ b/build/wince/tools/Makefile
@@ -37,17 +37,17 @@
 
 DEVENV_FLAG=-
 
 CC=cl -O2
 
 MOZCE_DEVENV=vs$(MOZ_MSVCVERSION)
 
 MOZCE_SHUNT_SLN=../shunt/build/$(MOZCE_DEVENV)/mozce_shunt_static.sln
-MOZCE_PROJECT="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+MOZCE_PROJECT="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
 MOZCE_SHUNT_DLL=../shunt/build/$(MOZCE_DEVENV)/mozce_shunt.dll
 MOZCE_TOOLS_DIR=$(MOZCE_DEVENV)ppc2003arm
 
 BUILD_SWITCH=$(DEVENV_FLAG)Build
 REBUILD_SWITCH=$(DEVENV_FLAG)Rebuild
 CLEAN_SWITCH=$(DEVENV_FLAG)clean
 
 
@@ -67,33 +67,33 @@ clobber:
 	rm -rf bin
 	devenv $(MOZCE_SHUNT_SLN) $(CLEAN_SWITCH) $(MOZCE_PROJECT)
 
 output_some_env:
 	@echo FOUND $(MOZCE_DEVENV)
 	@echo FOUND $(MOZCE_DEVENV): VSINSTALLDIR=$(VSINSTALLDIR) / MINGW32=$(MINGW32) / MSYSTEM=$(MSYSTEM)
 	@echo FOUND $(MOZCE_DEVENV)
 
-$(MOZCE_TOOLS_DIR)/arm-wince-as.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-as.c
+$(MOZCE_TOOLS_DIR)/arm-wince-as.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-as.c $(MOZCE_TOOLS_DIR)/toolspath.h
 	$(CC) $(MOZCE_TOOLS_DIR)/arm-wince-as.c
 	mkdir -p bin;
 	cp arm-wince-as.exe bin; mv arm-wince-as.exe $(MOZCE_TOOLS_DIR); rm *.obj
 
-$(MOZCE_TOOLS_DIR)/arm-wince-gcc.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-gcc.c
+$(MOZCE_TOOLS_DIR)/arm-wince-gcc.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-gcc.c $(MOZCE_TOOLS_DIR)/toolspath.h
 	$(CC) $(MOZCE_TOOLS_DIR)/arm-wince-gcc.c
 	mkdir -p bin;
 	cp arm-wince-gcc.exe bin; mv arm-wince-gcc.exe $(MOZCE_TOOLS_DIR); rm *.obj
 
-$(MOZCE_TOOLS_DIR)/arm-wince-lib.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-lib.c
+$(MOZCE_TOOLS_DIR)/arm-wince-lib.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-lib.c $(MOZCE_TOOLS_DIR)/toolspath.h
 	$(CC) $(MOZCE_TOOLS_DIR)/arm-wince-lib.c
 	mkdir -p bin;
 	cp arm-wince-lib.exe bin; mv arm-wince-lib.exe $(MOZCE_TOOLS_DIR); rm *.obj
 
-$(MOZCE_TOOLS_DIR)/arm-wince-link.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-link.c
+$(MOZCE_TOOLS_DIR)/arm-wince-link.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-link.c $(MOZCE_TOOLS_DIR)/toolspath.h
 	$(CC) $(MOZCE_TOOLS_DIR)/arm-wince-link.c
 	mkdir -p bin;
 	cp arm-wince-link.exe bin; mv arm-wince-link.exe $(MOZCE_TOOLS_DIR); rm *.obj
 
-$(MOZCE_TOOLS_DIR)/arm-wince-res.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-res.c
+$(MOZCE_TOOLS_DIR)/arm-wince-res.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-res.c $(MOZCE_TOOLS_DIR)/toolspath.h
 	$(CC) $(MOZCE_TOOLS_DIR)/arm-wince-res.c
 	mkdir -p bin;
 	cp arm-wince-res.exe bin; mv arm-wince-res.exe $(MOZCE_TOOLS_DIR); rm *.obj
 
--- a/build/wince/tools/vs8ppc2003arm/toolspath.h
+++ b/build/wince/tools/vs8ppc2003arm/toolspath.h
@@ -3,18 +3,18 @@
 #include <process.h>
 
 #ifndef TOPSRCDIR
 #include "../topsrcdir.h"
 #endif
 
 #define WCE_BIN   "c:\\Program Files\\Microsoft Visual Studio 8\\VC\\ce\\bin\\x86_arm\\"
 #define WCE_CRT   "c:\\Program Files\\Microsoft Visual Studio 8\\VC/ce\\lib\\armv4i"
-#define WCE_INC   "c:\\Program Files\\Windows Mobile 6 SDK\\Smartphone\\Include\\Armv4i"
-#define WCE_LIB   "c:\\Program Files\\Windows Mobile 6 SDK\\Smartphone\\Lib\\Armv4i"
+#define WCE_INC   "c:\\Program Files\\Windows Mobile 6 SDK\\PocketPC\\Include\\Armv4i"
+#define WCE_LIB   "c:\\Program Files\\Windows Mobile 6 SDK\\PocketPC\\Lib\\Armv4i"
 
 //#define WCE_RC_BIN "c:\\Program Files\\Microsoft Visual Studio 8\\VC\\bin\\"
 #define WCE_RC_BIN "c:\\Program Files\\Microsoft SDKs\\Windows\\v6.0\\bin\\"
 
 #define SHUNT_LIB TOPSRCDIR "/build/wince/shunt/build/vs8/"
 #define SHUNT_INC TOPSRCDIR "/build/wince/shunt/include/"
 
 #define ASM_PATH  WCE_BIN "armasm.exe"
--- a/build/wince/tools/vs9ppc2003arm/arm-wince-res.c
+++ b/build/wince/tools/vs9ppc2003arm/arm-wince-res.c
@@ -5,15 +5,16 @@ main(int argc, char **argv)
 {
   int iRetVal;
   char* args[1000];
   int i = 0;
   int j = 0;
   int k = 0;
   int s = 0;
   args[i++] = RC_PATH;
+  //  args[i++] = "/I\"" WCE_RC_INC "\"";
 
   argpath_conv(&argv[1], &args[i]);
 
   dumpargs(args);
 
   return run(args);
 }
--- a/build/wince/tools/vs9ppc2003arm/toolspath.h
+++ b/build/wince/tools/vs9ppc2003arm/toolspath.h
@@ -7,17 +7,17 @@
 #endif
 
 #define WCE_BIN    "c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\ce\\bin\\x86_arm\\"
 #define WCE_RC_BIN "c:\\Program Files\\Microsoft SDKs\\Windows\\v6.0a\\bin\\"
 //#define WCE_RC_BIN "c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\bin\\"
 #define WCE_CRT    "c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\ce\\lib\\armv4i"
 #define WCE_INC    "c:\\Program Files\\Windows Mobile 6 SDK\\PocketPC\\Include\\Armv4i"
 #define WCE_LIB    "c:\\Program Files\\Windows Mobile 6 SDK\\PocketPC\\Lib\\Armv4i"
-
+#define WCE_RC_INC  "C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\ce\\atlmfc\\include"
 
 #define SHUNT_LIB TOPSRCDIR "/build/wince/shunt/build/vs9/"
 #define SHUNT_INC TOPSRCDIR "/build/wince/shunt/include/"
 
 #define ASM_PATH  WCE_BIN "armasm.exe"
 #define CL_PATH   WCE_BIN "cl.exe"
 #define LIB_PATH  WCE_BIN "lib.exe"
 #define LINK_PATH WCE_BIN "link.exe"