#i106627# extend and adapt env for VC9, building manifest, change macro

12 files changed, 43 insertions, 38 deletions

diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 662bd3ae05f4..1cc7836d7414 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -42,7 +42,7 @@ var oo_sdk_ure_home=getUreHome();
 
 var oo_sdk_make_home=getMakeHome();
 var oo_sdk_zip_home=getZipHome();
-var oo_sdk_vc8_used="";
+var oo_sdk_manifest_used="";
 var oo_sdk_windowssdk="";
 var oo_sdk_cpp_home=getCppHome();
 var oo_sdk_cli_home=getCliHome();
@@ -391,6 +391,7 @@ function getCppHome()
 		// check Windows SDK if VC 9
         if (sVC.length > 0)
         {
+		    oo_sdk_manifest_used="true";	
 			try {
 				oo_sdk_windowssdk = WshShell.RegRead(regKeyWindowsSDK);
 			}catch (exc) {}
@@ -400,18 +401,16 @@ function getCppHome()
 	        try {
 				sVC = WshShell.RegRead(regKeyVCExpress80);
 			}catch (exc) {}
+	        if (sVC.length > 0)
+			   oo_sdk_manifest_used="true";
 		}        
         if (sVC.length == 0)
         {
 	        try {
 				sVC = WshShell.RegRead(regKeyVC80);
 			}catch (exc) {}
-		}        
-        if (sVC.length == 0)
-        {
-	        try {
-				sVC = WshShell.RegRead(regKeyVCExpress80);
-			}catch (exc) {}
+	        if (sVC.length > 0)
+			   oo_sdk_manifest_used="true";
 		}        
         if (sVC.length == 0)
         {
@@ -436,17 +435,17 @@ function getCppHome()
         if (sHome.length == 0)
         {
             //No user input, check OO_SDK_CPP_HOME or suggested value
-			if ( sSuggestedHome.length == 0 ) {
-			    bSkip = true;
-			} else {
-			    if ( !aFileSystemObject.FolderExists(sSuggestedHome) )
-				{
-					stdout.WriteLine("\n Error: Could not find directory \"" +
-									 sSuggestedHome + "\".");
-					sSuggestedHome = "";
-					bSkip = true;
-				}
-			}
+	    if ( sSuggestedHome.length == 0 ) {
+		bSkip = true;
+	    } else {
+	        if ( !aFileSystemObject.FolderExists(sSuggestedHome) )
+		{
+		    stdout.WriteLine("\n Error: Could not find directory \"" +
+				     sSuggestedHome + "\".");
+		    sSuggestedHome = "";
+		    bSkip = true;
+		}
+	    }
        
             sHome = sSuggestedHome;
         } else
@@ -787,6 +786,7 @@ function writeBatFile(fdir, file)
     if ( !fso.FolderExists(fdir) )
        fso.CreateFolder(fdir);
     var newFile = fso.CreateTextFile(file, true);
+
     newFile.Write(
         "@echo off\n" +
         "REM This script sets all enviroment variables, which\n" +
@@ -822,7 +822,7 @@ function writeBatFile(fdir, file)
         "REM Directory of the C++ compiler.\n" + 
         "REM Example:set OO_SDK_CPP_HOME=C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\bin\n" + 
         "set OO_SDK_CPP_HOME=" + oo_sdk_cpp_home + 
-		"\nset CPP_VC8=" + oo_sdk_vc8_used +
+		"\nset CPP_MANIFEST=" + oo_sdk_manifest_used +
 		"\nset CPP_WINDOWS_SDK=" + oo_sdk_windowssdk +
         "\n\n" + 
         "REM Directory of the C# and VB.NET compilers.\n" + 
@@ -931,6 +931,11 @@ function writeBatFile(fdir, file)
         "REM Add directory of the C++ compiler to the path, if necessary.\n" +
         "if defined OO_SDK_CPP_HOME set PATH=%OO_SDK_CPP_HOME%;%PATH%\n" + 
         "\n" +
+        "REM Add directory of the Win SDK to the path, if necessary.\n" +
+        "if defined CPP_WINDOWS_SDK (\n" +
+		"   set PATH=%CPP_WINDOWS_SDK\\bin%;%PATH%\n" + 
+		"   set INCLUDE=%CPP_WINDOWS_SDK\\Include%;%INCLUDE%\n" + 
+        ")\n" +
         "REM Add directory of the C# and VB.NET compilers to the path, if necessary.\n" + 
         "if defined OO_SDK_CLI_HOME set PATH=%OO_SDK_CLI_HOME%;%PATH%\n" + 
         "\n" + 
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
index f86b7950ba4b..c081c3747a63 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
@@ -90,7 +90,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
index 7e46f679096f..fb7b4a1ab52d 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
@@ -123,7 +123,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(SAMPLE_GEN_OUT)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
index c491eba8b436..076da65424aa 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
@@ -98,7 +98,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_MISC)/$(COMP_NAME).map $(SLOFILES) \
 	 $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))	 
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
index 7a0f16e6a687..19342ae673fb 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
@@ -69,16 +69,13 @@ $(OUT_SHL_SLO)/%.$(OBJ_EXT) : %.c
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(CC) $(CC_FLAGS) $(CC_INCLUDES) $(SDK_JAVA_INCLUDES) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
 
-$(OUT_SHL_MISC)/%.def : exports.dxp
+$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES) $(SHL_NAME).def
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	@echo EXPORTS > $(OUT_SHL_MISC)/$(SHL_NAME).def
-	$(CAT) exports.dxp >> $(OUT_SHL_MISC)/$(SHL_NAME).def
-
-$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES) $(OUT_SHL_MISC)/$(SHL_NAME).def
-	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(LINK) $(LIBRARY_LINK_FLAGS) /OUT:$@ /MAP:$(OUT_SHL_MISC)/$(SHL_NAME).map \
-	/DEF:$(OUT_SHL_MISC)/$(SHL_NAME).def $(LINK_JAVA_LIBS) \
+	-$(MKDIR) $(subst /,$(PS),$(OUT_SHL_MISC))
+	$(LINK) $(LIBRARY_LINK_FLAGS) /DEF:$(SHL_NAME).def /OUT:$@ \
+	/MAP:$(OUT_SHL_MISC)/$(SHL_NAME).map $(LINK_JAVA_LIBS) \
 	$(SLOFILES) jawt.lib msvcrt.lib kernel32.lib user32.lib
+	$(LINK_MANIFEST_VC8_ONLY)
 
 .PHONY: clean
 clean :
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.def b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.def
new file mode 100644
index 000000000000..f9ba2a78b6d1
--- /dev/null
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.def
@@ -0,0 +1,3 @@
+EXPORTS

+Java_NativeView_getNativeWindowSystemType

+Java_NativeView_getNativeWindow

diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
index 8883c4fe0de9..b292a3fac45b 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
@@ -92,7 +92,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
index 4ab62f8997da..b362c0769774 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
@@ -89,7 +89,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile
index e2eda4a5f532..400a18a089cf 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -99,7 +99,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/cpp/counter/Makefile b/odk/examples/cpp/counter/Makefile
index 997fb2a401e7..19372c226023 100644
--- a/odk/examples/cpp/counter/Makefile
+++ b/odk/examples/cpp/counter/Makefile
@@ -122,7 +122,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/cpp/remoteclient/Makefile b/odk/examples/cpp/remoteclient/Makefile
index 4486a5ac9f0a..e19d9c1c59a9 100644
--- a/odk/examples/cpp/remoteclient/Makefile
+++ b/odk/examples/cpp/remoteclient/Makefile
@@ -97,7 +97,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK) $(COMP_LINK_FLAGS) /OUT:$@ \
 	/MAP:$(OUT_COMP_GEN)/$(subst $(SHAREDLIB_EXT),map,$(@F)) $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB) msvcrt.lib kernel32.lib
-	$(LINK_MANIFEST_VC8_ONLY)
+	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 4b1b8216bec6..49614d731927 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -80,12 +80,12 @@ PATH_SEPARATOR=;
 
 # use this for release version
 CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
-ifeq "$(CPP_VC8)" "true"
+ifeq "$(CPP_MANIFEST)" "true"
 #CC_FLAGS+=-EHa -Zc:wchar_t-
-LINK_MANIFEST_VC8_ONLY=mt -manifest $@.manifest "-outputresource:$@;2"
+LINK_MANIFEST=mt -manifest $@.manifest "-outputresource:$@;2"
 else
 #CC_FLAGS+=
-LINK_MANIFEST_VC8_ONLY=
+LINK_MANIFEST=
 endif
 ifeq "$(DEBUG)" "yes"
 CC_FLAGS+=-Zi