[Mobies-commit] [commit] r4191 - in UDM/trunk: . Projects/Win32/VC10/src Projects/Win32/VC9/src scripts src
ksmyth at redhat3.isis.vanderbilt.edu
ksmyth at redhat3.isis.vanderbilt.edu
Tue Sep 3 11:48:40 CDT 2013
Author: ksmyth
Date: Tue Sep 3 11:48:39 2013
New Revision: 4191
Log:
Use JAVA_PATH everywhere, it is standard
Modified:
UDM/trunk/Projects/Win32/VC10/src/Java.props
UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops
UDM/trunk/UDM_compile_guideVS2008.txt
UDM/trunk/make.msbuild
UDM/trunk/scripts/vc9-env.bat
UDM/trunk/src/udm.build
Modified: UDM/trunk/Projects/Win32/VC10/src/Java.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Java.props Tue Sep 3 11:47:56 2013 (r4190)
+++ UDM/trunk/Projects/Win32/VC10/src/Java.props Tue Sep 3 11:48:39 2013 (r4191)
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
- <PropertyGroup Label="UserMacros">
- <JAVA_HOME>$(JDK_PATH)</JAVA_HOME>
- </PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(JDK_PATH)\include\win32;$(JDK_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(JAVA_HOME)\include\win32;$(JAVA_HOME)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>$(JDK_PATH)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(JAVA_HOME)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops Tue Sep 3 11:47:56 2013 (r4190)
+++ UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops Tue Sep 3 11:48:39 2013 (r4191)
@@ -6,11 +6,11 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\include";"$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\include";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\cpp";"$(UDM_3RDPARTY_PATH)\zlib";"$(UDM_3RDPARTY_PATH)\zlib\contrib\minizip";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\include";"$(UDM_3RDPARTY_PATH)\boost_1_44_0";"$(JDK_PATH)\include\win32";"$(JDK_PATH)\include";"$(GME_ROOT)\Interfaces";"$(GME_ROOT)\Gme\Interfaces";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib\cpp""
+ AdditionalIncludeDirectories=""$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\include";"$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\include";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\cpp";"$(UDM_3RDPARTY_PATH)\zlib";"$(UDM_3RDPARTY_PATH)\zlib\contrib\minizip";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\include";"$(UDM_3RDPARTY_PATH)\boost_1_44_0";"$(JAVA_HOME)\include\win32";"$(JAVA_HOME)\include";"$(GME_ROOT)\Interfaces";"$(GME_ROOT)\Gme\Interfaces";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib\cpp""
/>
<Tool
Name="VCLinkerTool"
- AdditionalLibraryDirectories=""$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\lib";"$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\lib";"$(UDM_3RDPARTY_PATH)\zlib";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib";"$(JDK_PATH)\lib""
+ AdditionalLibraryDirectories=""$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\lib";"$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\lib";"$(UDM_3RDPARTY_PATH)\zlib";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib";"$(JAVA_HOME)\lib""
/>
<Tool
Name="VCMIDLTool"
Modified: UDM/trunk/UDM_compile_guideVS2008.txt
==============================================================================
--- UDM/trunk/UDM_compile_guideVS2008.txt Tue Sep 3 11:47:56 2013 (r4190)
+++ UDM/trunk/UDM_compile_guideVS2008.txt Tue Sep 3 11:48:39 2013 (r4191)
@@ -22,7 +22,7 @@
your https://svn.isis.vanderbilt.edu/MoBIES/UDM/trunk/ working copy
UDM_3RDPARTY_PATH=
the UDM_VS2010 subdirectory of your https://svn.isis.vanderbilt.edu/isis-common/trunk/3rdparty/ working copy
- JDK_PATH=
+ JAVA_HOME=
your Java 1.5 (or later) JDK path, e.g. c:\Program Files\Java\jdk1.6.0_16
4. Use Projects/Win32/VC9/src/Udm.sln for VS2008 or Projects/Win32/VC10/src/Udm.sln for VS2010
Modified: UDM/trunk/make.msbuild
==============================================================================
--- UDM/trunk/make.msbuild Tue Sep 3 11:47:56 2013 (r4190)
+++ UDM/trunk/make.msbuild Tue Sep 3 11:48:39 2013 (r4191)
@@ -7,7 +7,8 @@
<Target Name="CheckEnv" DependsOnTargets="CheckEnvGme;CheckEnvUdm">
<Error Text="UDM_3RDPARTY_PATH='$(UDM_3RDPARTY_PATH)' doesn't exist" Condition="!Exists('$(UDM_3RDPARTY_PATH)')"/>
- <Error Text="JDK_PATH='$(JDK_PATH)' doesn't exist" Condition="!Exists('$(JDK_PATH)')"/>
+ <Error Text="JAVA_HOME='$(JAVA_HOME)' doesn't exist" Condition="!Exists('$(JAVA_HOME)')"/>
+ <Error Text="JAVA_HOME='$(JAVA_HOME)' doesn't point to a JDK" Condition="!Exists('$(JAVA_HOME)\include\jni.h')"/>
</Target>
<ItemGroup>
Modified: UDM/trunk/scripts/vc9-env.bat
==============================================================================
--- UDM/trunk/scripts/vc9-env.bat Tue Sep 3 11:47:56 2013 (r4190)
+++ UDM/trunk/scripts/vc9-env.bat Tue Sep 3 11:48:39 2013 (r4191)
@@ -1,10 +1,10 @@
@echo off
-: Read UDM_3RDPARTY_PATH and JDK_PATH from script with local settings
+: Read UDM_3RDPARTY_PATH and JAVA_HOME from script with local settings
if exist "%~dp0"vc9-env-local.bat call "%~dp0"vc9-env-local.bat
if not defined UDM_3RDPARTY_PATH echo Set UDM_3RDPARTY_PATH & exit /b 1
-if not defined JDK_PATH echo Set JDK_PATH & exit /b 1
+if not defined JAVA_HOME echo Set JAVA_HOME & exit /b 1
if not defined GME_ROOT echo Set GME_ROOT & exit /b 1
if defined UDM_PATH goto :udm_path_set
@@ -24,8 +24,6 @@
%UDM_3RDPARTY_PATH%\apache-ant-1.7.1\bin;^
%PATH%
-set JAVA_HOME=%JDK_PATH%
-
set _CLASSPATH=%UDM_3RDPARTY_PATH%\junit\junit.jar;%UDM_3RDPARTY_PATH%\antlr-2.7.7\antlr.jar
if defined CLASSPATH (set CLASSPATH=%_CLASSPATH%;%CLASSPATH%) else (set CLASSPATH=%_CLASSPATH%)
Modified: UDM/trunk/src/udm.build
==============================================================================
--- UDM/trunk/src/udm.build Tue Sep 3 11:47:56 2013 (r4190)
+++ UDM/trunk/src/udm.build Tue Sep 3 11:48:39 2013 (r4191)
@@ -28,7 +28,7 @@
<property name="Path.udm" value="${project::get-base-directory()}"/>
<setenv name="UDM_PATH" value="${Path.udm}\.."/>
- <property name="Path.jdk" value="${environment::get-variable('JDK_PATH')}"/>
+ <property name="Path.jdk" value="${environment::get-variable('JAVA_HOME')}"/>
<if test="${environment::variable-exists('VSVERSION')}">
<property name="Version.VS" value="${environment::get-variable('VSVERSION')}"/>"/>
More information about the Mobies-commit
mailing list