graal-compiler: src/share/tools/ProjectCreator/WinGammaPlatformVC7.java comparison

comparison src/share/tools/ProjectCreator/WinGammaPlatformVC7.java @ 2233:15d6977f04b0

7017824: Add support for creating 64-bit Visual Studio projects Summary: Updated create.bat and ProjectCreator Reviewed-by: brutisso, stefank, ohair

author	sla
date	Thu, 10 Feb 2011 13:03:22 +0100
parents	aa6e219afbf1
children	2ab52cda08e5 74e790c48cd4

comparison

equal deleted inserted replaced

-:b83527d0482d
+:15d6977f04b0
 /*
-* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 String projectVersion() {return "7.10";};
 public void writeProjectFile(String projectFileName, String projectName,
 Vector allConfigs) throws IOException {
 System.out.println();
-System.out.println("    Writing .vcproj file...");
+System.out.println("    Writing .vcproj file: "+projectFileName);
 // If we got this far without an error, we're safe to actually
 // write the .vcproj file
 printWriter = new PrintWriter(new FileWriter(projectFileName));
 printWriter.println("<?xml version=\"1.0\" encoding=\"windows-1251\"?>");
 "ProjectGUID", "{8822CB5C-1C41-41C2-8493-9F6E1994338B}",
 "SccProjectName", "",
 "SccLocalPath", ""
 }
 );
 startTag("Platforms", null);
-tag("Platform", new String[] {"Name", Util.os});
+tag("Platform", new String[] {"Name", (String) BuildConfig.getField(null, "PlatformName")});
 endTag("Platforms");
 startTag("Configurations", null);
 for (Iterator i = allConfigs.iterator(); i.hasNext(); ) {
 System.out.println("    Done.");
 }
 abstract class NameFilter {
 protected String fname;
 abstract boolean match(FileInfo fi);
 String  filterString() { return ""; }
 String name() { return this.fname;}
+@Override
+// eclipse auto-generated
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + getOuterType().hashCode();
+result = prime * result + ((fname == null) ? 0 : fname.hashCode());
+return result;
+}
+@Override
+// eclipse auto-generated
+public boolean equals(Object obj) {
+if (this == obj)
+return true;
+if (obj == null)
+return false;
+if (getClass() != obj.getClass())
+return false;
+NameFilter other = (NameFilter) obj;
+if (!getOuterType().equals(other.getOuterType()))
+return false;
+if (fname == null) {
+if (other.fname != null)
+return false;
+} else if (!fname.equals(other.fname))
+return false;
+return true;
+}
+// eclipse auto-generated
+private WinGammaPlatformVC7 getOuterType() {
+return WinGammaPlatformVC7.this;
+}
 }
 class DirectoryFilter extends NameFilter {
 String dir;
 int baseLen, dirLen;
 this.fname = fname;
 }
 boolean match(FileInfo fi) {
 int lastSlashIndex = fi.full.lastIndexOf('/');
 String fullDir = fi.full.substring(0, lastSlashIndex);
 return fullDir.endsWith(dir);
+}
+@Override
+// eclipse auto-generated
+public int hashCode() {
+final int prime = 31;
+int result = super.hashCode();
+result = prime * result + getOuterType().hashCode();
+result = prime * result + baseLen;
+result = prime * result + ((dir == null) ? 0 : dir.hashCode());
+result = prime * result + dirLen;
+return result;
+}
+@Override
+// eclipse auto-generated
+public boolean equals(Object obj) {
+if (this == obj)
+return true;
+if (!super.equals(obj))
+return false;
+if (getClass() != obj.getClass())
+return false;
+DirectoryFilter other = (DirectoryFilter) obj;
+if (!getOuterType().equals(other.getOuterType()))
+return false;
+if (baseLen != other.baseLen)
+return false;
+if (dir == null) {
+if (other.dir != null)
+return false;
+} else if (!dir.equals(other.dir))
+return false;
+if (dirLen != other.dirLen)
+return false;
+return true;
+}
+// eclipse auto-generated
+private WinGammaPlatformVC7 getOuterType() {
+return WinGammaPlatformVC7.this;
 }
 }
 class TypeFilter extends NameFilter {
 String[] exts;
 String currentDir = "";
 DirectoryFilter container = null;
 for(FileInfo fileInfo : files) {
 if (!fileInfo.full.startsWith(sbase)) {
 continue;
 }
 int lastSlash = fileInfo.full.lastIndexOf('/');
 String dir = fileInfo.full.substring(sbase.length(), lastSlash);
 if(dir.equals("share/vm")) {
 // skip files directly in share/vm - should only be precompiled.hpp which is handled below
 continue;
 }
 if (!dir.equals(currentDir)) {
 currentDir = dir;
-if (container != null) {
+if (container != null && !rv.contains(container)) {
 rv.add(container);
 }
 // remove "share/vm/" from names
 String name = dir;
 if (dir.startsWith("share/vm/")) {
 name = dir.substring("share/vm/".length(), dir.length());
 }
-container = new DirectoryFilter(name, dir, sbase);
+DirectoryFilter newfilter = new DirectoryFilter(name, dir, sbase);
-}
+int i = rv.indexOf(newfilter);
-}
+if(i == -1) {
-if (container != null) {
+container = newfilter;
-rv.add(container);
+} else {
+// if the filter already exists, reuse it
+container = (DirectoryFilter) rv.get(i);
+}
+}
+}
+if (container != null && !rv.contains(container)) {
+rv.add(container);
 }
 ContainerFilter generated = new ContainerFilter("Generated");
 ContainerFilter c1Generated = new ContainerFilter("C1");
 c1Generated.add(new SpecificPathFilter("C++ Interpreter Generated", new String[] {".*compiler1/generated/jvmtifiles/bytecodeInterpreterWithChecks.+"}));
 addAttr(rv, "ExceptionHandling", "FALSE");
 return rv;
 }
-Vector getBaseLinkerFlags(String outDir, String outDll) {
+Vector getBaseLinkerFlags(String outDir, String outDll, String platformName) {
 Vector rv = new Vector();
 addAttr(rv, "Name", "VCLinkerTool");
 addAttr(rv, "AdditionalOptions",
 "/export:JNI_GetDefaultJavaVMInitArgs " +
 addAttr(rv, "ProgramDatabaseFile", outDir+Util.sep+"jvm.pdb");
 // Set /SUBSYSTEM option. 2 is subSystemWindows
 addAttr(rv, "SubSystem", "2");
 addAttr(rv, "BaseAddress", "0x8000000");
 addAttr(rv, "ImportLibrary", outDir+Util.sep+"jvm.lib");
-// Set /MACHINE option. 1 is machineX86
+if(platformName.equals("Win32")) {
-addAttr(rv, "TargetMachine", "1");
+// Set /MACHINE option. 1 is X86
+addAttr(rv, "TargetMachine", "1");
+} else {
+// Set /MACHINE option. 17 is X64
+addAttr(rv, "TargetMachine", "17");
+}
 return rv;
 }
 void  getDebugCompilerFlags_common(String opt,Vector rv) {
 void getProductCompilerFlags_common(Vector rv) {
 // Set /O2 option. 2 is optimizeMaxSpeed
 addAttr(rv, "Optimization", "2");
 // Set /Oy- option
 addAttr(rv, "OmitFramePointers", "FALSE");
-}
-Vector getProductCompilerFlags() {
-Vector rv = new Vector();
-getProductCompilerFlags_common(rv);
 // Set /Ob option.  1 is expandOnlyInline
 addAttr(rv, "InlineFunctionExpansion", "1");
 // Set /GF option.
 addAttr(rv, "StringPooling", "TRUE");
 // Set /MD option. 2 is rtMultiThreadedDLL
 addAttr(rv, "RuntimeLibrary", "2");
 // Set /Gy option
 addAttr(rv, "EnableFunctionLevelLinking", "TRUE");
+}
+Vector getProductCompilerFlags() {
+Vector rv = new Vector();
+getProductCompilerFlags_common(rv);
 return rv;
 }
 Vector getProductLinkerFlags() {
 String getNoOptFlag() {
 return "0";
 }
-String makeCfgName(String flavourBuild) {
+String makeCfgName(String flavourBuild, String platform) {
-return  flavourBuild + "|" + Util.os;
+return  flavourBuild + "|" + platform;
 }
 }

Mercurial > hg > graal-compiler

comparison src/share/tools/ProjectCreator/WinGammaPlatformVC7.java @ 2233:15d6977f04b0