< prev index next >

common/nb_native/nbproject/configurations.xml

Print this page 

        
@@ -1909,19 +1909,13 @@
       <codeAssistance>
         <envVariables>
           <Elem>IDE_ALT_BOOTDIR</Elem>
         </envVariables>
         <transientMacros>
-          <Elem>FULL_VERSION="version"</Elem>
           <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
           <Elem>HOTSPOT_BUILD_USER="user"</Elem>
           <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-          <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-          <Elem>JDK_MAJOR_VERSION="version"</Elem>
-          <Elem>JDK_MICRO_VERSION="version"</Elem>
-          <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          <Elem>JRE_RELEASE_VERSION="version"</Elem>
         </transientMacros>
       </codeAssistance>
       <makefileType>
         <makeTool>
           <buildCommandWorkingDir>../..</buildCommandWorkingDir>

@@ -4532,11 +4526,10 @@
             ex="false"
             tool="1"
             flavor2="0">
         <ccTool>
           <preprocessorList>
-            <Elem>JRE_RELEASE_VERSION="version"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
       <item path="../../hotspot/src/share/vm/services/attachListener.cpp"
             ex="false"

@@ -4855,19 +4848,16 @@
             <pElem>../../build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2/generated</pElem>
           </incDir>
           <preprocessorList>
             <Elem>AMD64</Elem>
             <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
             <Elem>GAMMA</Elem>
             <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
             <Elem>HOTSPOT_BUILD_USER="user"</Elem>
             <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
             <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
             <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LAUNCHER_TYPE="gamma"</Elem>
             <Elem>LINK_INTO_LIBJVM</Elem>
             <Elem>PRODUCT</Elem>
             <Elem>TARGET_ARCH_MODEL_x86_64</Elem>
             <Elem>TARGET_ARCH_x86</Elem>

@@ -5344,14 +5334,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/lang">
         <cTool>

@@ -5397,14 +5383,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Finalizer.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/lang/reflect">

@@ -5427,14 +5409,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Array.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/net">

@@ -5486,14 +5464,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Bits.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/security">

@@ -5523,14 +5497,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="AccessController.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/util">

@@ -5567,14 +5537,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/util/zip">
         <cTool>

@@ -6139,14 +6105,10 @@
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LINUX</Elem>
             <Elem>NDEBUG</Elem>
             <Elem>RELEASE=""</Elem>
             <Elem>THIS_FILE="GC.c"</Elem>
             <Elem>_GNU_SOURCE</Elem>

@@ -6196,14 +6158,10 @@
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LINUX</Elem>
             <Elem>NDEBUG</Elem>
             <Elem>RELEASE=""</Elem>
             <Elem>THIS_FILE="ConstantPool.c"</Elem>
             <Elem>_GNU_SOURCE</Elem>

@@ -6575,14 +6533,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="jdk_util_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/java">

@@ -6621,14 +6575,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/java/lang">
         <cTool>

@@ -6650,14 +6600,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/java/net">

@@ -6709,14 +6655,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/sun">

@@ -7035,14 +6977,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/sun/xawt">

@@ -7133,19 +7071,13 @@
       <codeAssistance>
         <envVariables>
           <Elem>IDE_ALT_BOOTDIR</Elem>
         </envVariables>
         <transientMacros>
-          <Elem>FULL_VERSION="version"</Elem>
           <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
           <Elem>HOTSPOT_BUILD_USER="user"</Elem>
           <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-          <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-          <Elem>JDK_MAJOR_VERSION="version"</Elem>
-          <Elem>JDK_MICRO_VERSION="version"</Elem>
-          <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          <Elem>JRE_RELEASE_VERSION="version"</Elem>
         </transientMacros>
       </codeAssistance>
       <makefileType>
         <makeTool>
           <buildCommandWorkingDir>../..</buildCommandWorkingDir>

@@ -9820,11 +9752,10 @@
             ex="false"
             tool="1"
             flavor2="0">
         <ccTool>
           <preprocessorList>
-            <Elem>JRE_RELEASE_VERSION="version"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
       <item path="../../hotspot/src/share/vm/services/attachListener.cpp"
             ex="false"

@@ -10481,14 +10412,11 @@
             <pElem>../../jdk/src/linux/bin</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
             <Elem>JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LAUNCHER_NAME="openjdk"</Elem>
             <Elem>NEVER_ACT_AS_SERVER_CLASS_MACHINE</Elem>
             <Elem>PROGNAME="javac"</Elem>
             <Elem>THIS_FILE="main.c"</Elem>
           </preprocessorList>

@@ -11347,14 +11275,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="check_version.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/common/jdk_util.c"

@@ -11380,14 +11304,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="jdk_util.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/common/jio.c"

@@ -11413,14 +11333,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="jio.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/common/jni_util.c"

@@ -11446,14 +11362,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="jni_util.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/common/verify_stub.c"

@@ -11479,14 +11391,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="verify_stub.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/io/FileInputStream.c"

@@ -11567,14 +11475,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Class.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/ClassLoader.c"

@@ -11600,14 +11504,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="ClassLoader.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Compiler.c"

@@ -11633,14 +11533,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Compiler.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Double.c"

@@ -11666,14 +11562,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Double.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Float.c"

@@ -11699,14 +11591,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Float.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Object.c"

@@ -11732,14 +11620,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Object.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Package.c"

@@ -11765,14 +11649,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Package.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/ResourceBundle.c"

@@ -11798,14 +11678,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="ResourceBundle.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Runtime.c"

@@ -11831,14 +11707,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Runtime.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/SecurityManager.c"

@@ -11864,14 +11736,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="SecurityManager.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Shutdown.c"

@@ -11897,14 +11765,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Shutdown.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/StrictMath.c"

@@ -11930,14 +11794,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="StrictMath.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/String.c"

@@ -11963,14 +11823,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="String.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/System.c"

@@ -11996,14 +11852,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="System.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Thread.c"

@@ -12029,14 +11881,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Thread.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Throwable.c"

@@ -12062,14 +11910,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Throwable.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_acos.c"

@@ -12802,14 +12646,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="TimeZone.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c"

@@ -20851,19 +20691,16 @@
             <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
           </incDir>
           <preprocessorList>
             <Elem>AMD64</Elem>
             <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
             <Elem>GAMMA</Elem>
             <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
             <Elem>HOTSPOT_BUILD_USER="user"</Elem>
             <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
             <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
             <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LAUNCHER_TYPE="gamma"</Elem>
             <Elem>LINK_INTO_LIBJVM</Elem>
             <Elem>LINUX</Elem>
             <Elem>PRODUCT</Elem>
             <Elem>TARGET_ARCH_MODEL_x86_64</Elem>

@@ -20917,19 +20754,16 @@
             <pElem>../../build/linux-x86_64-normal-server-release/hotspot/linux_amd64_compiler2/generated</pElem>
           </incDir>
           <preprocessorList>
             <Elem>AMD64</Elem>
             <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
             <Elem>GAMMA</Elem>
             <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
             <Elem>HOTSPOT_BUILD_USER="user"</Elem>
             <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
             <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
             <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LAUNCHER_TYPE="gamma"</Elem>
             <Elem>LINK_INTO_LIBJVM</Elem>
             <Elem>LINUX</Elem>
             <Elem>PRODUCT</Elem>
             <Elem>TARGET_ARCH_MODEL_x86_64</Elem>

@@ -21822,14 +21656,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/lang">
         <cTool>

@@ -21875,14 +21705,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Finalizer.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/lang/reflect">

@@ -21905,14 +21731,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Array.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/net">

@@ -21964,14 +21786,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Bits.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/security">

@@ -22001,14 +21819,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="AccessController.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/util">

@@ -22045,14 +21859,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/util/zip">
         <cTool>

@@ -22617,14 +22427,10 @@
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LINUX</Elem>
             <Elem>NDEBUG</Elem>
             <Elem>RELEASE=""</Elem>
             <Elem>THIS_FILE="GC.c"</Elem>
             <Elem>_GNU_SOURCE</Elem>

@@ -22674,14 +22480,10 @@
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LINUX</Elem>
             <Elem>NDEBUG</Elem>
             <Elem>RELEASE=""</Elem>
             <Elem>THIS_FILE="ConstantPool.c"</Elem>
             <Elem>_GNU_SOURCE</Elem>

@@ -23053,14 +22855,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="jdk_util_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/java">

@@ -23099,14 +22897,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/java/lang">
         <cTool>

@@ -23128,14 +22922,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/java/net">

@@ -23187,14 +22977,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/sun">

@@ -23513,14 +23299,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/sun/xawt">

@@ -23611,19 +23393,13 @@
       <codeAssistance>
         <envVariables>
           <Elem>IDE_ALT_BOOTDIR</Elem>
         </envVariables>
         <transientMacros>
-          <Elem>FULL_VERSION="version"</Elem>
           <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
           <Elem>HOTSPOT_BUILD_USER="user"</Elem>
           <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
-          <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-          <Elem>JDK_MAJOR_VERSION="version"</Elem>
-          <Elem>JDK_MICRO_VERSION="version"</Elem>
-          <Elem>JDK_MINOR_VERSION="minor"</Elem>
-          <Elem>JRE_RELEASE_VERSION="version"</Elem>
         </transientMacros>
       </codeAssistance>
       <makefileType>
         <makeTool>
           <buildCommandWorkingDir>../..</buildCommandWorkingDir>

@@ -27452,11 +27228,10 @@
             ex="false"
             tool="1"
             flavor2="0">
         <ccTool>
           <preprocessorList>
-            <Elem>JRE_RELEASE_VERSION="version"</Elem>
           </preprocessorList>
         </ccTool>
       </item>
       <item path="../../hotspot/src/share/vm/services/attachListener.cpp"
             ex="false"

@@ -28128,15 +27903,12 @@
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
             <Elem>HAVE_GETHRTIME</Elem>
             <Elem>JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LAUNCHER_NAME="openjdk"</Elem>
             <Elem>NEVER_ACT_AS_SERVER_CLASS_MACHINE</Elem>
             <Elem>PROGNAME="javac"</Elem>
             <Elem>THIS_FILE="main.c"</Elem>
           </preprocessorList>

@@ -28959,14 +28731,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="check_version.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/common/jdk_util.c"

@@ -28992,14 +28760,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="jdk_util.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/common/jio.c"

@@ -29025,14 +28789,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="jio.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/common/jni_util.c"

@@ -29058,14 +28818,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="jni_util.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/common/verify_stub.c"

@@ -29091,14 +28847,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="verify_stub.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/io/FileInputStream.c"

@@ -29179,14 +28931,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Class.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/ClassLoader.c"

@@ -29212,14 +28960,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="ClassLoader.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Compiler.c"

@@ -29245,14 +28989,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Compiler.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Double.c"

@@ -29278,14 +29018,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Double.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Float.c"

@@ -29311,14 +29047,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Float.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Object.c"

@@ -29344,14 +29076,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Object.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Package.c"

@@ -29377,14 +29105,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Package.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/ResourceBundle.c"

@@ -29410,14 +29134,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="ResourceBundle.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Runtime.c"

@@ -29443,14 +29163,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Runtime.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/SecurityManager.c"

@@ -29476,14 +29192,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="SecurityManager.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Shutdown.c"

@@ -29509,14 +29221,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Shutdown.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/StrictMath.c"

@@ -29542,14 +29250,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="StrictMath.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/String.c"

@@ -29575,14 +29279,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="String.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/System.c"

@@ -29608,14 +29308,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="System.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Thread.c"

@@ -29641,14 +29337,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Thread.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/Throwable.c"

@@ -29674,14 +29366,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Throwable.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/lang/fdlibm/src/e_acos.c"

@@ -30414,14 +30102,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="TimeZone.c"</Elem>
           </preprocessorList>
         </cTool>
       </item>
       <item path="../../jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c"

@@ -38548,19 +38232,16 @@
             <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
           </incDir>
           <preprocessorList>
             <Elem>AMD64</Elem>
             <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
             <Elem>GAMMA</Elem>
             <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
             <Elem>HOTSPOT_BUILD_USER="user"</Elem>
             <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
             <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
             <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LAUNCHER_TYPE="gamma"</Elem>
             <Elem>LINK_INTO_LIBJVM</Elem>
             <Elem>PRODUCT</Elem>
             <Elem>SOLARIS</Elem>
             <Elem>SPARC_WORKS</Elem>

@@ -38721,19 +38402,16 @@
             <pElem>../../build/solaris-x86_64-normal-server-release/hotspot/solaris_amd64_compiler2/product</pElem>
           </incDir>
           <preprocessorList>
             <Elem>AMD64</Elem>
             <Elem>ARCH="amd64"</Elem>
-            <Elem>FULL_VERSION="version"</Elem>
             <Elem>GAMMA</Elem>
             <Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
             <Elem>HOTSPOT_BUILD_USER="user"</Elem>
             <Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
             <Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
             <Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>LAUNCHER_TYPE="gamma"</Elem>
             <Elem>LINK_INTO_LIBJVM</Elem>
             <Elem>PRODUCT</Elem>
             <Elem>SOLARIS</Elem>
             <Elem>SPARC_WORKS</Elem>

@@ -39573,14 +39251,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/lang">
         <cTool>

@@ -39626,14 +39300,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Finalizer.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/lang/reflect">

@@ -39656,14 +39326,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Array.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/net">

@@ -39715,14 +39381,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="Bits.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/security">

@@ -39752,14 +39414,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="AccessController.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/util">

@@ -39796,14 +39454,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/share/native/java/util/zip">
         <cTool>

@@ -40379,14 +40033,10 @@
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
             <Elem>ARCHPROPNAME="amd64"</Elem>
             <Elem>BREAKPTS</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>MACRO_MEMSYS_OPS</Elem>
             <Elem>NDEBUG</Elem>
             <Elem>RELEASE=""</Elem>
             <Elem>SOLARIS</Elem>
             <Elem>THIS_FILE="GC.c"</Elem>

@@ -40439,14 +40089,10 @@
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
             <Elem>ARCHPROPNAME="amd64"</Elem>
             <Elem>BREAKPTS</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>MACRO_MEMSYS_OPS</Elem>
             <Elem>NDEBUG</Elem>
             <Elem>RELEASE=""</Elem>
             <Elem>SOLARIS</Elem>
             <Elem>THIS_FILE="ConstantPool.c"</Elem>

@@ -40914,14 +40560,10 @@
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
             <Elem>ARCHPROPNAME="amd64"</Elem>
             <Elem>BREAKPTS</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>MACRO_MEMSYS_OPS</Elem>
             <Elem>NDEBUG</Elem>
             <Elem>RELEASE=""</Elem>
             <Elem>SOLARIS</Elem>
             <Elem>THIS_FILE="jdk_util_md.c"</Elem>

@@ -40984,14 +40626,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/java/lang">
         <cTool>

@@ -41013,14 +40651,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/java/net">

@@ -41072,14 +40706,10 @@
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
             <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
           </preprocessorList>
         </cTool>
       </folder>
       <folder path="$SRC/jdk/src/solaris/native/sun">

@@ -41526,14 +41156,10 @@
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
             <Elem>ARCHPROPNAME="amd64"</Elem>
             <Elem>BREAKPTS</Elem>
-            <Elem>JDK_BUILD_NUMBER="nn"</Elem>
-            <Elem>JDK_MAJOR_VERSION="version"</Elem>
-            <Elem>JDK_MICRO_VERSION="version"</Elem>
-            <Elem>JDK_MINOR_VERSION="minor"</Elem>
             <Elem>MACRO_MEMSYS_OPS</Elem>
             <Elem>NDEBUG</Elem>
             <Elem>RELEASE=""</Elem>
             <Elem>SOLARIS</Elem>
             <Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>



< prev index next >