Skip to content

Commit

Permalink
build update
Browse files Browse the repository at this point in the history
  • Loading branch information
@poidasmith
poidasmith committed Apr 13, 2013
1 parent 49ac3a2 commit e5dcbe4
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 25 deletions.
66 changes: 45 additions & 21 deletions WinRun4J/build/WinRun4J.vcproj
View file
Expand Up @@ -100,6 +100,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
Expand Down Expand Up @@ -189,6 +192,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
Expand Down Expand Up @@ -270,6 +276,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
Expand Down Expand Up @@ -350,6 +359,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
Expand Down Expand Up @@ -426,6 +438,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
Expand Down Expand Up @@ -500,6 +515,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
Expand Down Expand Up @@ -581,6 +599,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
Expand Down Expand Up @@ -662,6 +683,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
Expand Down Expand Up @@ -844,16 +868,15 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="$(InputDir)\asm.bat $(InputDir) $(InputName) &quot;$(OutDir)&quot;&#x0D;&#x0A;"
Outputs="$(OutDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug - Console|Win32"
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Expand All @@ -862,20 +885,20 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release - Console|Win32"
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="$(InputDir)\asm.bat $(InputDir) $(InputName) &quot;$(OutDir)&quot;&#x0D;&#x0A;"
Outputs="$(OutDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
Name="Debug - Console|Win32"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="$(InputDir)\asm.bat $(InputDir) $(InputName) &quot;$(OutDir)&quot;&#x0D;&#x0A;"
Outputs="$(OutDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -887,11 +910,12 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
Name="Release - Console|Win32"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="$(InputDir)\asm.bat $(InputDir) $(InputName) &quot;$(OutDir)&quot;&#x0D;&#x0A;"
Outputs="$(OutDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -915,11 +939,12 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Debug - Console|Win32"
ExcludedFromBuild="true"
Name="Debug|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="$(InputDir)\asm64.bat $(InputDir) $(InputName) &quot;$(OutDir)&quot;&#x0D;&#x0A;"
Outputs="$(OutDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -931,20 +956,20 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release - Console|Win32"
ExcludedFromBuild="true"
Name="Release|x64"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="$(InputDir)\asm64.bat $(InputDir) $(InputName) &quot;$(OutDir)&quot;&#x0D;&#x0A;"
Outputs="$(OutDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
Name="Debug - Console|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="$(InputDir)\asm64.bat $(InputDir) $(InputName) &quot;$(OutDir)&quot;&#x0D;&#x0A;"
Outputs="$(OutDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -957,12 +982,11 @@
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
Name="Release - Console|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
CommandLine="$(InputDir)\asm64.bat $(InputDir) $(InputName) &quot;$(OutDir)&quot;&#x0D;&#x0A;"
Outputs="$(OutDir)\$(InputName).obj"
/>
</FileConfiguration>
<FileConfiguration
Expand Down
2 changes: 1 addition & 1 deletion WinRun4J/src/WinRun4J.cpp
View file
Expand Up @@ -143,7 +143,7 @@ int WinRun4J::DoBuiltInCommand(HINSTANCE hInstance)
}

if(StartsWith(lpArg1, "--WinRun4J:Version")) {
Log::Info("0.5.0\n");
Log::Info("0.4.5\n");
return 0;
}

Expand Down
4 changes: 2 additions & 2 deletions org.boris.winrun4j.test/java/src/org/boris/winrun4j/test/unit/INITest.java
View file
Expand Up @@ -33,9 +33,8 @@ public class INITest
public void testINI() throws Exception {
Launcher l = TestHelper.launcher();
l.arg("hello");
l.vmarg("-Dtest=this");
l.main(PrintEnvironment.class);
String result = TestHelper.run(l);
String result = TestHelper.run(l, "-Dtest=this", "-Xms128M");
assertTrue(result.contains("arg.1=hello"));
assertTrue(result.contains("vmarg.1=-Dtest=this"));
assertTrue(result.contains("WinRun4J:module.ini="));
Expand All @@ -61,6 +60,7 @@ public void testLargeINI() throws Exception {
}

public static void main(String[] args) throws Exception {
new INITest().testINI();
new INITest().testLargeINI();
}
}
2 changes: 1 addition & 1 deletion org.boris.winrun4j/build.xml
View file
Expand Up @@ -3,7 +3,7 @@
<property name="release.dir" value="c:\Development\Releases"/>
<property name="src.dir" value="c:\eclipse\git\winrun4j\WinRun4J"/>
<property name="release.name" value="winrun4J"/>
<property name="release.version" value="0.4.4"/>
<property name="release.version" value="0.4.5"/>
<property name="deploy.dir" value="${release.dir}/${release.name}-${release.version}/winrun4j"/>

<target name="build">
Expand Down

0 comments on commit e5dcbe4

Please sign in to comment.