Merge remote-tracking branch 'refs/remotes/origin/master' into preferences

[scilab.git] / scilab / Visual-Studio-settings / ant-all / ant-all.vcxproj

diff --git a/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj b/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
index d0c6244..8f690dc 100644 (file)
--- a/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
+++ b/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
@@ -90,6 +90,7 @@ cd $(SolutionDir)modules\ui_data && call ant
 cd $(SolutionDir)modules\history_browser && call ant
 cd $(SolutionDir)modules\javasci && call ant
 cd $(SolutionDir)modules\scinotes && call ant
+cd $(SolutionDir)modules\preferences && call ant
 
 </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
@@ -114,29 +115,31 @@ 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\javasci &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\preferences &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\commons  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\jvm  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\renderer  &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\action_binding  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\console  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\graphic_export  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\types  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\gui  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\core  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\hdf5  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\graph  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\helptools  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\xcos  &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\javasci  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\scinotes  &amp;&amp; call ant clean
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
+cd $(SolutionDir)modules\renderer &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\action_binding &amp;&amp; call ant clean
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
+cd $(SolutionDir)modules\xcos &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\javasci &amp;&amp; call ant clean
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
+cd $(SolutionDir)modules\preferences &amp;&amp; call ant clean
 
 </NMakeCleanCommandLine>
     <NMakeOutput>
@@ -166,6 +169,7 @@ cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
 cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant
 cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
+cd $(SolutionDir)modules\preferences &amp;&amp; call ant
 
 </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
@@ -190,29 +194,31 @@ 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\javasci &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\preferences &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\commons  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\jvm  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\renderer  &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\action_binding  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\console  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\graphic_export  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\types  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\gui  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\core  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\hdf5  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\graph  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\helptools  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\xcos  &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\javasci  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\scinotes  &amp;&amp; call ant clean
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
+cd $(SolutionDir)modules\renderer &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\action_binding &amp;&amp; call ant clean
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
+cd $(SolutionDir)modules\xcos &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\javasci &amp;&amp; call ant clean
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
+cd $(SolutionDir)modules\preferences &amp;&amp; call ant clean
 
 </NMakeCleanCommandLine>
     <NMakeOutput>
@@ -242,6 +248,7 @@ cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
 cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant
 cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
+cd $(SolutionDir)modules\preferences &amp;&amp; call ant
 
 </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
@@ -266,29 +273,31 @@ 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\javasci &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\preferences &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\commons  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\jvm  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\renderer  &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\action_binding  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\console  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\graphic_export  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\types  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\gui  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\core  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\hdf5  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\graph  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\helptools  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\xcos  &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\javasci  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\scinotes  &amp;&amp; call ant clean
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
+cd $(SolutionDir)modules\renderer &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\action_binding &amp;&amp; call ant clean
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
+cd $(SolutionDir)modules\xcos &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\javasci &amp;&amp; call ant clean
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
+cd $(SolutionDir)modules\preferences &amp;&amp; call ant clean
 
 </NMakeCleanCommandLine>
     <NMakeOutput>
@@ -318,6 +327,7 @@ cd $(SolutionDir)modules\ui_data &amp;&amp; call ant
 cd $(SolutionDir)modules\history_browser &amp;&amp; call ant
 cd $(SolutionDir)modules\javasci &amp;&amp; call ant
 cd $(SolutionDir)modules\scinotes &amp;&amp; call ant
+cd $(SolutionDir)modules\preferences &amp;&amp; call ant
 
 </NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>set JAVA_HOME=$(SolutionDir)java\jdk
@@ -342,29 +352,31 @@ 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\javasci &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\preferences &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\commons  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\jvm  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\renderer  &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\action_binding  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\console  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\graphic_export  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\types  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\gui  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\core  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\hdf5  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\graph  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\helptools  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\xcos  &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\javasci  &amp;&amp; call ant clean
-cd $(SolutionDir)modules\scinotes  &amp;&amp; call ant clean
+cd $(SolutionDir)modules\localization &amp;&amp; call ant clean
+cd $(SolutionDir)modules\commons &amp;&amp; call ant clean
+cd $(SolutionDir)modules\jvm &amp;&amp; call ant clean
+cd $(SolutionDir)modules\renderer &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\action_binding &amp;&amp; call ant clean
+cd $(SolutionDir)modules\console &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graphic_export &amp;&amp; call ant clean
+cd $(SolutionDir)modules\types &amp;&amp; call ant clean
+cd $(SolutionDir)modules\gui &amp;&amp; call ant clean
+cd $(SolutionDir)modules\core &amp;&amp; call ant clean
+cd $(SolutionDir)modules\hdf5 &amp;&amp; call ant clean
+cd $(SolutionDir)modules\graph &amp;&amp; call ant clean
+cd $(SolutionDir)modules\helptools &amp;&amp; call ant clean
+cd $(SolutionDir)modules\xcos &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\javasci &amp;&amp; call ant clean
+cd $(SolutionDir)modules\scinotes &amp;&amp; call ant clean
+cd $(SolutionDir)modules\preferences &amp;&amp; call ant clean
 
 </NMakeCleanCommandLine>
     <NMakeOutput>