add ant-all project and fix path with solutiondir macro 13/3713/1
Allan CORNET [Mon, 4 Apr 2011 15:12:47 +0000 (17:12 +0200)]
Change-Id: Ifeb5f8afef81a8cd98c6eca1844b592bae9fe2bd

33 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj [new file with mode: 0644]
scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj.filters [new file with mode: 0644]
scilab/modules/action_binding/src/java/action_binding-JAVA.vcxproj
scilab/modules/commons/src/java/commons-JAVA.vcxproj
scilab/modules/completion/src/java/completion-JAVA.vcxproj
scilab/modules/console/src/java/console-JAVA.vcxproj
scilab/modules/core/src/java/core-JAVA.vcxproj
scilab/modules/graph/src/java/graph-JAVA.vcxproj
scilab/modules/graph/tests/java/graph-JAVA-tests.vcxproj
scilab/modules/graphic_export/src/java/graphic_export-JAVA.vcxproj
scilab/modules/gui/src/java/gui-JAVA.vcxproj
scilab/modules/hdf5/src/java/hdf5-JAVA.vcxproj
scilab/modules/hdf5/tests/java/hdf5-JAVA-tests.vcxproj
scilab/modules/helptools/src/java/helptools-JAVA.vcxproj
scilab/modules/helptools/src/javadoc/javadoc.vcxproj
scilab/modules/history_browser/src/java/history_browser-JAVA.vcxproj
scilab/modules/history_manager/src/java/history_manager-JAVA.vcxproj
scilab/modules/javasci/src/java/javasci-JAVA.vcxproj
scilab/modules/javasci/tests/java/javasci-JAVA-tests.vcxproj
scilab/modules/jvm/src/java/jvm-JAVA.vcxproj
scilab/modules/localization/src/java/localization-JAVA.vcxproj
scilab/modules/output_stream/src/java/output_stream-JAVA.vcxproj
scilab/modules/renderer/src/java/renderer-JAVA.vcxproj
scilab/modules/scinotes/src/java/scinotes-JAVA.vcxproj
scilab/modules/shell/src/java/shell-JAVA.vcxproj
scilab/modules/types/src/java/types-JAVA.vcxproj
scilab/modules/ui_data/src/java/ui_data-JAVA.vcxproj
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj
scilab/modules/xcos/src/java/xcos-JAVA.vcxproj
scilab/modules/xcos/tests/java/xcos-JAVA-tests.vcxproj
scilab/tools/localization/generatePoFile.vcxproj

index 55e359c..0acaa44 100644 (file)
@@ -562,6 +562,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildJavadoc", "modules\hel
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallel", "modules\parallel\src\c\parallel.vcxproj", "{56A2E2F3-26CF-45D5-BE7A-534C39CD7003}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ant-all", "Visual-Studio-settings\ant-all\ant-all.vcxproj", "{A9A2020D-5541-44F2-B080-DF3C9426C409}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -1794,6 +1796,10 @@ Global
                {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.Build.0 = Release|Win32
                {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.ActiveCfg = Release|x64
                {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.Build.0 = Release|x64
+               {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|Win32.ActiveCfg = Debug|Win32
+               {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|x64.ActiveCfg = Debug|x64
+               {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|Win32.ActiveCfg = Release|Win32
+               {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|x64.ActiveCfg = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 34fd51c..8296c2c 100644 (file)
@@ -339,6 +339,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javasci-JAVA-tests", "modul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildJavadoc", "modules\helptools\src\javadoc\javadoc.vcxproj", "{F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ant-all", "Visual-Studio-settings\ant-all\ant-all.vcxproj", "{A9A2020D-5541-44F2-B080-DF3C9426C409}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -1563,6 +1565,10 @@ Global
                {F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}.Release|Win32.Build.0 = Release|Win32
                {F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}.Release|x64.ActiveCfg = Release|x64
                {F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}.Release|x64.Build.0 = Release|x64
+               {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|Win32.ActiveCfg = Debug|Win32
+               {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|x64.ActiveCfg = Debug|x64
+               {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|Win32.ActiveCfg = Release|Win32
+               {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|x64.ActiveCfg = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj b/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
new file mode 100644 (file)
index 0000000..fdcd17c
--- /dev/null
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\build.incl.xml" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A9A2020D-5541-44F2-B080-DF3C9426C409}</ProjectGuid>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
+    <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <NMakeBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant
+cd $(SolutionDir)modules\shell &amp;&amp; call ant
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant
+cd $(SolutionDir)modules\commons &amp;&amp; call ant
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant
+cd $(SolutionDir)modules\completion &amp;&amp; call ant
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant
+cd $(SolutionDir)modules\console &amp;&amp; call ant
+cd $(SolutionDir)modules\gui &amp;&amp; call ant
+cd $(SolutionDir)modules\types &amp;&amp; call ant
+cd $(SolutionDir)modules\graph &amp;&amp; call ant
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant
+cd $(SolutionDir)modules\core &amp;&amp; call ant
+</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean &amp;&amp; call ant
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\shell &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\completion &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean &amp;&amp;  call ant
+
+</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean
+cd $(SolutionDir)modules\shell &amp;&amp; call ant clean
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean
+cd $(SolutionDir)modules\completion &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean
+
+</NMakeCleanCommandLine>
+    <NMakeOutput> </NMakeOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <NMakeBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant
+cd $(SolutionDir)modules\shell &amp;&amp; call ant
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant
+cd $(SolutionDir)modules\commons &amp;&amp; call ant
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant
+cd $(SolutionDir)modules\completion &amp;&amp; call ant
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant
+cd $(SolutionDir)modules\console &amp;&amp; call ant
+cd $(SolutionDir)modules\gui &amp;&amp; call ant
+cd $(SolutionDir)modules\types &amp;&amp; call ant
+cd $(SolutionDir)modules\graph &amp;&amp; call ant
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant
+cd $(SolutionDir)modules\core &amp;&amp; call ant
+</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean &amp;&amp; call ant
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\shell &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\completion &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean &amp;&amp;  call ant
+
+</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean
+cd $(SolutionDir)modules\shell &amp;&amp; call ant clean
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean
+cd $(SolutionDir)modules\completion &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean
+
+</NMakeCleanCommandLine>
+    <NMakeOutput> </NMakeOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <NMakeBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant
+cd $(SolutionDir)modules\shell &amp;&amp; call ant
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant
+cd $(SolutionDir)modules\commons &amp;&amp; call ant
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant
+cd $(SolutionDir)modules\completion &amp;&amp; call ant
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant
+cd $(SolutionDir)modules\console &amp;&amp; call ant
+cd $(SolutionDir)modules\gui &amp;&amp; call ant
+cd $(SolutionDir)modules\types &amp;&amp; call ant
+cd $(SolutionDir)modules\graph &amp;&amp; call ant
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant
+cd $(SolutionDir)modules\core &amp;&amp; call ant
+</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean &amp;&amp; call ant
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\shell &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\completion &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean &amp;&amp;  call ant
+
+</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean
+cd $(SolutionDir)modules\shell &amp;&amp; call ant clean
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean
+cd $(SolutionDir)modules\completion &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean
+
+</NMakeCleanCommandLine>
+    <NMakeOutput> </NMakeOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+    <NMakeBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant
+cd $(SolutionDir)modules\shell &amp;&amp; call ant
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant
+cd $(SolutionDir)modules\commons &amp;&amp; call ant
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant
+cd $(SolutionDir)modules\completion &amp;&amp; call ant
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant
+cd $(SolutionDir)modules\console &amp;&amp; call ant
+cd $(SolutionDir)modules\gui &amp;&amp; call ant
+cd $(SolutionDir)modules\types &amp;&amp; call ant
+cd $(SolutionDir)modules\graph &amp;&amp; call ant
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant
+cd $(SolutionDir)modules\core &amp;&amp; call ant
+</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean &amp;&amp; call ant
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\shell &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\completion &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean &amp;&amp;  call ant
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean &amp;&amp;  call ant
+
+</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
+cd $(SolutionDir)modules\renderer &amp;&amp; call ant clean
+cd $(SolutionDir)modules\shell &amp;&amp; call ant clean
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+cd $(SolutionDir)modules\action_binding &amp;&amp; call ant clean
+cd $(SolutionDir)modules\history_manager &amp;&amp; call ant clean
+cd $(SolutionDir)modules\completion &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
+cd $(SolutionDir)modules\xcos &amp;&amp; call ant clean
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
+cd $(SolutionDir)modules\javasci &amp;&amp; call ant clean
+cd $(SolutionDir)modules\ui_data &amp;&amp; call ant clean
+cd $(SolutionDir)modules\history_browser &amp;&amp; call ant clean
+cd $(SolutionDir)modules\output_stream &amp;&amp; call ant clean
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean
+
+</NMakeCleanCommandLine>
+    <NMakeOutput> </NMakeOutput>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj.filters b/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj.filters
new file mode 100644 (file)
index 0000000..3a26852
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\build.incl.xml" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
index f8a65cf..5e80f25 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\action_binding\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -82,19 +82,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\action_binding\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -107,19 +107,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\action_binding\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -132,19 +132,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\action_binding\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index ab6137e..4eba8ab 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\commons\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -80,18 +80,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\commons\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -103,18 +103,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\commons\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -126,18 +126,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\commons\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
index 6c8f97b..89f5b5a 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\completion\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -83,20 +83,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\completion\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -109,20 +109,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\completion\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -135,20 +135,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\completion\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index 4631bfb..310019b 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\console\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -82,19 +82,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\console\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -107,19 +107,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\console\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -132,19 +132,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\console\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index baf1227..b31f6ba 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\core\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -83,20 +83,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\core\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -109,20 +109,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\core\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -135,20 +135,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\core\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index 25d0d15..64fdd80 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\graph\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -80,18 +80,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\graph\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -103,18 +103,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\graph\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -126,18 +126,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\graph\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
index 3ed680b..4c6bfe5 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\graph\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
@@ -76,13 +76,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\graph\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
@@ -96,13 +96,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\graph\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
@@ -116,13 +116,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\graph\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
index fda8d73..f85ff6e 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\graphic_export\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -83,20 +83,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\graphic_export\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -109,20 +109,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\graphic_export\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -135,20 +135,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\graphic_export\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index 0f37fa2..2a860f6 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\gui\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -81,19 +81,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\gui\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -105,19 +105,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\gui\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -129,19 +129,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\gui\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
index 202be03..4f8704c 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\hdf5\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -82,19 +82,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\hdf5\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -107,19 +107,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\hdf5\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -132,19 +132,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\hdf5\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index 1780b12..6361e75 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\hdf5\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
@@ -76,13 +76,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\hdf5\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
@@ -96,13 +96,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\hdf5\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
@@ -116,13 +116,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\hdf5\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
index 62fc548..869c90b 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\helptools\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -81,19 +81,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\helptools\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -105,19 +105,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\helptools\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -129,19 +129,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\helptools\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
index e6d2344..b7f6227 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set PATH=%3b$(SolutionDir)java\jdk\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set PATH=;$(SolutionDir)java\jdk\bin;%PATH%;
 IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
-javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java%3b$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
+javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java;$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set PATH=%3b$(SolutionDir)java\jdk\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set PATH=;$(SolutionDir)java\jdk\bin;%PATH%;
 IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
-javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java%3b$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
+javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java;$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
 </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
 </NMakeCleanCommandLine>
@@ -75,13 +75,13 @@ javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/jav
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set PATH=%3b$(SolutionDir)java\jdk\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set PATH=;$(SolutionDir)java\jdk\bin;%PATH%;
 IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
-javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java%3b$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
+javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java;$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set PATH=%3b$(SolutionDir)java\jdk\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set PATH=;$(SolutionDir)java\jdk\bin;%PATH%;
 IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
-javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java%3b$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
+javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java;$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
 </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
 </NMakeCleanCommandLine>
@@ -93,13 +93,13 @@ javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/jav
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set PATH=%3b$(SolutionDir)java\jdk\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set PATH=;$(SolutionDir)java\jdk\bin;%PATH%;
 IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
-javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java%3b$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
+javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java;$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set PATH=%3b$(SolutionDir)java\jdk\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set PATH=;$(SolutionDir)java\jdk\bin;%PATH%;
 IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
-javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java%3b$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
+javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java;$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
 </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
 </NMakeCleanCommandLine>
@@ -111,13 +111,13 @@ javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/jav
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set PATH=%3b$(SolutionDir)java\jdk\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set PATH=;$(SolutionDir)java\jdk\bin;%PATH%;
 IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
-javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java%3b$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
+javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java;$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set PATH=%3b$(SolutionDir)java\jdk\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set PATH=;$(SolutionDir)java\jdk\bin;%PATH%;
 IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
-javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java%3b$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
+javadoc -noindex -nohelp -nonavbar -notree -d "$(SolutionDir)modules/javasci/javadoc" -sourcepath "$(SolutionDir)modules/javasci/src/java;$(SolutionDir)modules/types/src/java" org.scilab.modules.javasci org.scilab.modules.types
 </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">IF EXIST "$(SolutionDir)modules\javasci\javadoc" rmdir /s /q "$(SolutionDir)modules\javasci\javadoc"
 </NMakeCleanCommandLine>
index 3243717..cda44ee 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\history_browser\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -80,18 +80,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\history_browser\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -103,18 +103,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\history_browser\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -126,18 +126,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\history_browser\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
index 2c2c79d..067cfb9 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\history_manager\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -83,20 +83,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\history_manager\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -109,20 +109,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\history_manager\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -135,20 +135,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\history_manager\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index b125756..f637d86 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\javasci\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -81,18 +81,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\javasci\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -105,18 +105,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\javasci\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -129,18 +129,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\javasci\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index e30643f..d4b5f2f 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\javasci\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b$(SolutionDir)\bin%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;$(SolutionDir)bin;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b$(SolutionDir)\bin%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;$(SolutionDir)bin;
 cd ..\..
 call ant test
 
@@ -76,13 +76,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\javasci\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b$(SolutionDir)\bin%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;$(SolutionDir)bin;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b$(SolutionDir)\bin%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;$(SolutionDir)bin;
 cd ..\..
 call ant test
 
@@ -96,13 +96,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\javasci\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b$(SolutionDir)\bin%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;$(SolutionDir)bin;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b$(SolutionDir)\bin%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;$(SolutionDir)bin;
 cd ..\..
 call ant test
 
@@ -116,13 +116,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\javasci\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b$(SolutionDir)\bin%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;$(SolutionDir)bin;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b$(SolutionDir)\bin%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;$(SolutionDir)bin;
 cd ..\..
 call ant test
 
index 7a02481..e46f8b6 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\jvm\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -83,20 +83,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\jvm\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -109,20 +109,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\jvm\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -135,20 +135,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\jvm\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index 8c1ba30..ef5a20c 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\localization\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -82,19 +82,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\localization\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -107,19 +107,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\localization\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -132,19 +132,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\localization\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index 2c20a1c..29906a4 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\output_stream\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -83,20 +83,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\output_stream\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -109,20 +109,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\output_stream\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -135,20 +135,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\output_stream\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index 4d80a2a..b780eef 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\renderer\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -83,20 +83,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\renderer\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -109,20 +109,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\renderer\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -135,20 +135,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\renderer\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index a950b89..9d28f41 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\scinotes\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -80,18 +80,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\scinotes\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -103,18 +103,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\scinotes\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -126,18 +126,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\scinotes\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
index 57ea9df..861326e 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -83,20 +83,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -109,20 +109,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -135,20 +135,20 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index 854b5c7..92bafa3 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\types\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -82,19 +82,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\types\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -107,19 +107,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\types\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
@@ -132,19 +132,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\types\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 
index 83c3b2a..041cc97 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -80,18 +80,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -103,18 +103,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -126,18 +126,18 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
index 52e9494..c49ced4 100644 (file)
@@ -76,7 +76,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\DetectFramework2;$(SolutionDir)libs\GetWindowsVersion;$(SolutionDir)libs\MALLOC\includes;$(SolutionDir)\modules\core\includes;$(SolutionDir)modules\windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\DetectFramework2;$(SolutionDir)libs\GetWindowsVersion;$(SolutionDir)libs\MALLOC\includes;$(SolutionDir)modules\core\includes;$(SolutionDir)modules\windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\DetectFramework2;$(SolutionDir)libs\GetWindowsVersion;$(SolutionDir)libs\MALLOC\includes;$(SolutionDir)\modules\core\includes;$(SolutionDir)modules\windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\DetectFramework2;$(SolutionDir)libs\GetWindowsVersion;$(SolutionDir)libs\MALLOC\includes;$(SolutionDir)modules\core\includes;$(SolutionDir)modules\windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\DetectFramework2;$(SolutionDir)libs\GetWindowsVersion;$(SolutionDir)libs\MALLOC\includes;$(SolutionDir)\modules\core\includes;$(SolutionDir)modules\windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\DetectFramework2;$(SolutionDir)libs\GetWindowsVersion;$(SolutionDir)libs\MALLOC\includes;$(SolutionDir)modules\core\includes;$(SolutionDir)modules\windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
     </Midl>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(SolutionDir)libs\DetectFramework2;$(SolutionDir)libs\GetWindowsVersion;$(SolutionDir)libs\MALLOC\includes;$(SolutionDir)\modules\core\includes;$(SolutionDir)modules\windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)libs\DetectFramework2;$(SolutionDir)libs\GetWindowsVersion;$(SolutionDir)libs\MALLOC\includes;$(SolutionDir)modules\core\includes;$(SolutionDir)modules\windows_tools\src\c\scilab_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
index bdc739f..5869159 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\xcos\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -81,19 +81,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\xcos\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -105,19 +105,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\xcos\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
@@ -129,19 +129,19 @@ call ant clean
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\xcos\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 call ant
 </NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant clean
 </NMakeCleanCommandLine>
index b696b85..9b1350f 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)modules\xcos\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
@@ -76,13 +76,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)modules\xcos\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
@@ -96,13 +96,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)modules\xcos\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
@@ -116,13 +116,13 @@ call ant test
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)modules\xcos\jar\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 </NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)\java\jdk
-set PATH=$(SolutionDir)\java\ant\bin%3b%PATH%%3b
+    <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">set JAVA_HOME=$(SolutionDir)java\jdk
+set PATH=$(SolutionDir)java\ant\bin;%PATH%;
 cd ..\..
 call ant test
 
index 0b4f59e..a50e71e 100644 (file)
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)locales\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27)%3bquit
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27);quit
 </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">IF EXIST "$(SolutionDir)locale" rmdir /s /q  "$(SolutionDir)locale"
-"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27)%3bquit
+"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27);quit
 </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">rmdir /s /q  "$(SolutionDir)locale"</NMakeCleanCommandLine>
     <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)locales\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27)%3bquit
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27);quit
 </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">IF EXIST "$(SolutionDir)locale" rmdir /s /q  "$(SolutionDir)locale"
-"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27)%3bquit
+"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27);quit
 </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rmdir /s /q  "$(SolutionDir)locale"</NMakeCleanCommandLine>
     <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)locales\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27)%3bquit
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27);quit
 </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">IF EXIST "$(SolutionDir)locale" rmdir /s /q  "$(SolutionDir)locale"
-"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27)%3bquit
+"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27);quit
 </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">rmdir /s /q  "$(SolutionDir)locale"</NMakeCleanCommandLine>
     <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     <NMakeForcedUsingAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeForcedUsingAssemblies)</NMakeForcedUsingAssemblies>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)locales\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
-    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27)%3bquit
+    <NMakeBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27);quit
 </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">IF EXIST "$(SolutionDir)locale" rmdir /s /q  "$(SolutionDir)locale"
-"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27)%3bquit
+"$(SolutionDir)bin\scilex.exe" -nb -nwni -e exec(SCI+%27/tools/localization/generatePoFile.sce%27);quit
 </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rmdir /s /q  "$(SolutionDir)locale"</NMakeCleanCommandLine>
     <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />