Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up outdated code for palm-size pc #2217

Merged
merged 1 commit into from
Jun 22, 2018
Merged

Clean up outdated code for palm-size pc #2217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,8 @@ void writeExecutableResourceFile(Artifact artifact) throws UMAException {

buffer.append(
"\n" +
"#include <windows.h>\n");
writeResourceFileDefines(buffer);
buffer.append(
"#include <windows.h>\n" +
"#include <winver.h>\n" +
"#include \"j9cfg.h\"\n" +
"#include \"j9version.h\"\n" +
"\n" +
Expand Down Expand Up @@ -492,18 +491,6 @@ void writeResourceFile(Artifact artifact) throws UMAException {
break;
}
}

final protected void writeResourceFileDefines(StringBuffer buffer) throws UMAException {
String ceOsType = replaceMacro("uma_ce_os_type");
if ( ceOsType!=null && ceOsType.equalsIgnoreCase("Palm-size PC 2.11") ) {
buffer.append("#define VS_VERSION_INFO 1\n" +
"#define VOS_NT_WINDOWS32 0x00040004L\n" +
"#define VFT_APP 0x00000001L\n" +
"#define VFT_DLL 0x00000002L\n");
} else {
buffer.append("#include <winver.h>\n");
}
}

// TODO: move to template file
void writeSharedLibResourceFile(Artifact artifact) throws UMAException {
Expand All @@ -522,9 +509,8 @@ void writeSharedLibResourceFile(Artifact artifact) throws UMAException {

buffer.append(
"\n" +
"#include <windows.h>\n" );
writeResourceFileDefines(buffer);
buffer.append(
"#include <windows.h>\n" +
"#include <winver.h>\n" +
"#include \"j9cfg.h\"\n" +
"#include \"j9version.h\"\n" +
"\n" +
Expand Down