diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-12-01 16:36:34 +0100 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-12-01 16:36:34 +0100 |
| commit | ad7f0194ce2d89994b4d6fea8856238dd718a4a0 (patch) | |
| tree | 58f4887851605367d96236c4de6ac05e92d25b4d /src | |
| parent | 82b3d2e292355c7b30f35e68e9506ccbd3c48a34 (diff) | |
| download | cpptasks-parallel-ad7f0194ce2d89994b4d6fea8856238dd718a4a0.tar.gz cpptasks-parallel-ad7f0194ce2d89994b4d6fea8856238dd718a4a0.tar.bz2 cpptasks-parallel-ad7f0194ce2d89994b4d6fea8856238dd718a4a0.tar.xz cpptasks-parallel-ad7f0194ce2d89994b4d6fea8856238dd718a4a0.zip | |
Changed subsystem default back to 'gui'
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java | 3 | ||||
| -rw-r--r-- | src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java | 21 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java index 24dac1b..19dd207 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java @@ -26,8 +26,7 @@ public final class SubsystemEnum extends EnumeratedAttribute { private final static String[] values = new String[]{"gui", "console", "other"}; public SubsystemEnum() { -// FREEHEP changed from gui into console - setValue("console"); + setValue("gui"); } public String[] getValues() { return (String[]) values.clone(); diff --git a/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java index e35c5e6..994b068 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/TestLinkerDef.java @@ -243,8 +243,7 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - // FREEHEP changed from WINDOWS into CONSOLE - assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); + assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/BASE:0x2710", preArgs[3]); } @@ -261,8 +260,7 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - // FREEHEP changed from WINDOWS into CONSOLE - assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); + assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/STACK:0x2710", preArgs[3]); } @@ -293,8 +291,7 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - // FREEHEP changed from WINDOWS into CONSOLE - assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); + assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/FIXED", preArgs[3]); } @@ -311,8 +308,7 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - // FREEHEP changed from WINDOWS into CONSOLE - assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); + assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); assertEquals("/INCREMENTAL:YES", preArgs[2]); } @@ -328,8 +324,7 @@ public final class TestLinkerDef setLinkerName(extendedLinker, "msvc"); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - // FREEHEP changed from WINDOWS into CONSOLE - assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); + assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/MAP", preArgs[3]); } @@ -354,8 +349,7 @@ public final class TestLinkerDef extendedLinker.setBase(new FlexLong("10000")); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - // FREEHEP changed from WINDOWS into CONSOLE - assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); + assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/BASE:0x2710", preArgs[3]); } @@ -373,8 +367,7 @@ public final class TestLinkerDef extendedLinker.setBase(new FlexLong("10000")); String[] preArgs = getPreArguments(extendedLinker); assertEquals("/NOLOGO", preArgs[0]); - // FREEHEP changed from WINDOWS into CONSOLE - assertEquals("/SUBSYSTEM:CONSOLE", preArgs[1]); + assertEquals("/SUBSYSTEM:WINDOWS", preArgs[1]); assertEquals("/INCREMENTAL:NO", preArgs[2]); assertEquals("/BASE:0x2710", preArgs[3]); } |