comparison make/windows/build.bat @ 1322:21141e23627a

6923488: 4/4 need minor tweaks to HotSpot build for Cygwin Summary: Clean up get_msc_ver, build.bat and build.make in general and for Cygwin. Reviewed-by: ohair
author dcubed
date Tue, 16 Mar 2010 17:47:03 -0600
parents d1605aabd0a1
children 39e409a664b3
comparison
equal deleted inserted replaced
914:50a95aa4a247 1322:21141e23627a
55 if not "%7" == "" goto usage 55 if not "%7" == "" goto usage
56 56
57 if "%1" == "product" goto test1 57 if "%1" == "product" goto test1
58 if "%1" == "debug" goto test1 58 if "%1" == "debug" goto test1
59 if "%1" == "fastdebug" goto test1 59 if "%1" == "fastdebug" goto test1
60 if "%1" == "tree" goto test1
60 goto usage 61 goto usage
61 62
62 :test1 63 :test1
63 if "%2" == "core" goto test2 64 if "%2" == "core" goto test2
64 if "%2" == "kernel" goto test2 65 if "%2" == "kernel" goto test2
65 if "%2" == "compiler1" goto test2 66 if "%2" == "compiler1" goto test2
66 if "%2" == "compiler2" goto test2 67 if "%2" == "compiler2" goto test2
67 if "%2" == "tiered" goto test2 68 if "%2" == "tiered" goto test2
68 if "%2" == "adlc" goto build_adlc 69 if "%2" == "adlc" goto build_adlc
69 70
70 goto usage 71 goto usage
71 72
72 :test2 73 :test2
74 if "%1" == "tree" goto build_tree
73 REM check_j2se_version 75 REM check_j2se_version
74 REM jvmti.make requires J2SE 1.4.x or newer. 76 REM jvmti.make requires J2SE 1.4.x or newer.
75 REM If not found then fail fast. 77 REM If not found then fail fast.
76 %4\bin\javap javax.xml.transform.TransformerFactory >NUL 78 %4\bin\javap javax.xml.transform.TransformerFactory >NUL
77 if %errorlevel% == 0 goto build 79 if %errorlevel% == 0 goto build
91 93
92 :build_adlc 94 :build_adlc
93 nmake -f %3/make/windows/build.make Variant=compiler2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION=%5 ADLC_ONLY=1 %1 95 nmake -f %3/make/windows/build.make Variant=compiler2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION=%5 ADLC_ONLY=1 %1
94 goto end 96 goto end
95 97
98 :build_tree
99 nmake -f %3/make/windows/build.make Variant=%2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION="%5" %1
100 goto end
101
96 :usage 102 :usage
97 echo Usage: build flavor version workspace bootstrap_dir [build_id] [windbg_home] 103 echo Usage: build flavor version workspace bootstrap_dir [build_id] [windbg_home]
98 echo. 104 echo.
99 echo where: 105 echo where:
100 echo flavor is "product", "debug" or "fastdebug", 106 echo flavor is "product", "debug" or "fastdebug",
101 echo version is "core", "kernel", "compiler1", "compiler2", or "tiered", 107 echo version is "core", "kernel", "compiler1", "compiler2", or "tiered",
102 echo workspace is source directory without trailing slash, 108 echo workspace is source directory without trailing slash,
103 echo bootstrap_dir is a full path to echo a JDK in which bin/java 109 echo bootstrap_dir is a full path to a JDK in which bin/java
104 echo and bin/javac are present and working, and echo build_id is an 110 echo and bin/javac are present and working, and build_id is an
105 echo optional build identifier displayed by java -version 111 echo optional build identifier displayed by java -version
112 exit 1
106 113
107 :end 114 :end
115 exit %errorlevel%