archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8022740: Visual 2008 IDE build is broken

Browse source 
Fixed project generation code, and added warning to upgrade to VS 2008 SP1.

Reviewed-by: dcubed, ccheung
This commit is contained in:
Ioi Lam 2013-08-10 10:56:27 -07:00
parent 4d2ab5385c
commit 5189d350c9
5 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hotspot/make/windows/projectfiles/common/Makefile
View file

@ -112,6 +112,7 @@ ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -def
ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions) ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions)
$(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
@if "$(MSC_VER)"=="1500" echo Make sure you have VS2008 SP1 or later, or you may see 'expanded command line too long'
@$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions) @$(RUN_JAVA) -Djava.class.path="$(HOTSPOTBUILDSPACE)/classes" ProjectCreator WinGammaPlatform$(VcVersion) $(ProjectCreatorIDEOptions)
clean: clean:

8
hotspot/src/share/tools/ProjectCreator/FileTreeCreator.java
View file

@ -12,11 +12,15 @@ public class FileTreeCreator extends SimpleFileVisitor<Path>
final int startDirLength; final int startDirLength;
Stack<DirAttributes> attributes = new Stack<DirAttributes>(); Stack<DirAttributes> attributes = new Stack<DirAttributes>();
Vector<BuildConfig> allConfigs; Vector<BuildConfig> allConfigs;
WinGammaPlatformVC10 wg; WinGammaPlatform wg;
WinGammaPlatformVC10 wg10;
public FileTreeCreator(Path startDir, Vector<BuildConfig> allConfigs, WinGammaPlatformVC10 wg) { public FileTreeCreator(Path startDir, Vector<BuildConfig> allConfigs, WinGammaPlatform wg) {
super(); super();
this.wg = wg; this.wg = wg;
if (wg instanceof WinGammaPlatformVC10) {
wg10 = (WinGammaPlatformVC10)wg;
}
this.allConfigs = allConfigs; this.allConfigs = allConfigs;
this.startDir = startDir; this.startDir = startDir;
startDirLength = startDir.toAbsolutePath().toString().length(); startDirLength = startDir.toAbsolutePath().toString().length();

6
hotspot/src/share/tools/ProjectCreator/FileTreeCreatorVC10.java
View file

@ -103,7 +103,7 @@ public class FileTreeCreatorVC10 extends FileTreeCreator {
} }
} }
String tagName = wg.getFileTagFromSuffix(fileName); String tagName = wg10.getFileTagFromSuffix(fileName);
if (!useIgnore && !disablePch && !usePch && !isReplacedByAltSrc) { if (!useIgnore && !disablePch && !usePch && !isReplacedByAltSrc) {
wg.tag(tagName, new String[] { "Include", fileLoc}); wg.tag(tagName, new String[] { "Include", fileLoc});
@ -133,7 +133,7 @@ public class FileTreeCreatorVC10 extends FileTreeCreator {
} }
String filter = startDir.relativize(file.getParent().toAbsolutePath()).toString(); String filter = startDir.relativize(file.getParent().toAbsolutePath()).toString();
wg.addFilterDependency(fileLoc, filter); wg10.addFilterDependency(fileLoc, filter);
return CONTINUE; return CONTINUE;
} }
@ -162,7 +162,7 @@ public class FileTreeCreatorVC10 extends FileTreeCreator {
if (!hide) { if (!hide) {
String name = startDir.relativize(path.toAbsolutePath()).toString(); String name = startDir.relativize(path.toAbsolutePath()).toString();
if (!"".equals(name)) { if (!"".equals(name)) {
wg.addFilter(name); wg10.addFilter(name);
} }
attributes.push(newAttr); attributes.push(newAttr);

2
hotspot/src/share/tools/ProjectCreator/FileTreeCreatorVC7.java
View file

@ -12,7 +12,7 @@ import java.util.Vector;
public class FileTreeCreatorVC7 extends FileTreeCreator { public class FileTreeCreatorVC7 extends FileTreeCreator {
public FileTreeCreatorVC7(Path startDir, Vector<BuildConfig> allConfigs, WinGammaPlatform wg) { public FileTreeCreatorVC7(Path startDir, Vector<BuildConfig> allConfigs, WinGammaPlatform wg) {
super(startDir, allConfigs, null); super(startDir, allConfigs, wg);
} }
@Override @Override

7
hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
View file

@ -139,6 +139,9 @@ public class WinGammaPlatformVC7 extends WinGammaPlatform {
tagV("Tool", cfg.getV("LinkerFlags")); tagV("Tool", cfg.getV("LinkerFlags"));
String postBuildCmd = BuildConfig.getFieldString(null,
"PostbuildCommand");
if (postBuildCmd != null) {
tag("Tool", tag("Tool",
new String[] { new String[] {
"Name", "Name",
@ -149,9 +152,9 @@ public class WinGammaPlatformVC7 extends WinGammaPlatform {
// Caution: String.replace(String,String) is available // Caution: String.replace(String,String) is available
// from JDK5 onwards only // from JDK5 onwards only
"CommandLine", "CommandLine",
cfg.expandFormat(BuildConfig.getFieldString(null, cfg.expandFormat(postBuildCmd.replace("\t",
"PostbuildCommand").replace("\t",
"&#x0D;&#x0A;")) }); "&#x0D;&#x0A;")) });
}
tag("Tool", new String[] { "Name", "VCPreBuildEventTool" }); tag("Tool", new String[] { "Name", "VCPreBuildEventTool" });