From 70cad56bdd81e007dffbd6c40e6a9a4cbb75987a Mon Sep 17 00:00:00 2001
From: Jacques Grelet <jacques.grelet@ird.fr>
Date: Thu, 12 Jan 2012 19:28:45 +0000
Subject: [PATCH] maj des projets avant deplacement dans compiler
---
tsgqc_linux.prj | 129 +++++++++++++++++++++++++++++++++-------------
tsgqc_windows.prj | 27 +++-------
2 files changed, 100 insertions(+), 56 deletions(-)
diff --git a/tsgqc_linux.prj b/tsgqc_linux.prj
index 483b5f8..c0abbd1 100644
--- a/tsgqc_linux.prj
+++ b/tsgqc_linux.prj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment-project>
- <configuration target="target.standalone" target-name="Standalone Application" name="tsgqc_linux" location="/home/graal/jgrelet/svn/tsg-qc/trunk" file="/home/graal/jgrelet/svn/tsg-qc/trunk/tsgqc_linux.prj" build-checksum="2927239023">
- <param.project.name>/home/graal/jgrelet/svn/tsg-qc/trunk/tsgqc_linux.prj</param.project.name>
+ <configuration target="target.standalone" target-name="Standalone Application" name="tsgqc_linux" location="/mnt/C/svn/tsg-qc/trunk" file="/mnt/C/svn/tsg-qc/trunk/tsgqc_linux.prj" build-checksum="965885553">
+ <param.project.name>/mnt/C/svn/tsg-qc/trunk/tsgqc_linux.prj</param.project.name>
<param.target.type>Standalone Application</param.target.type>
<param.appname>tsgqc_linux</param.appname>
<param.intermediate>${PROJECT_ROOT}/tsgqc_linux/src</param.intermediate>
@@ -61,14 +61,14 @@
<file>${PROJECT_ROOT}/tsgqc.m</file>
</fileset.main>
<fileset.resources>
- <file>/home/graal/jgrelet/matlab/toolbox/m_map</file>
- <file>/home/graal/jgrelet/matlab/toolbox/seawater</file>
- <file>/home/graal/jgrelet/svn/oceano/lib/matlab/woa01_annual_surf.nc</file>
- <file>/home/graal/jgrelet/svn/oceano/lib/matlab/woa01_monthly_surf.nc</file>
- <file>/home/graal/jgrelet/svn/oceano/lib/matlab/woa01_seasonal_surf.nc</file>
- <file>/home/graal/jgrelet/svn/oceano/lib/matlab/woa05_annual_surf.nc</file>
- <file>/home/graal/jgrelet/svn/oceano/lib/matlab/woa05_monthly_surf.nc</file>
- <file>/home/graal/jgrelet/svn/oceano/lib/matlab/woa05_seasonal_surf.nc</file>
+ <file>/mnt/C/Users/jgrelet/Documents/MATLAB/toolbox/m_map</file>
+ <file>/mnt/C/Users/jgrelet/Documents/MATLAB/toolbox/m_map/private</file>
+ <file>/mnt/C/svn/oceano/lib/matlab/woa01_annual_surf.nc</file>
+ <file>/mnt/C/svn/oceano/lib/matlab/woa01_monthly_surf.nc</file>
+ <file>/mnt/C/svn/oceano/lib/matlab/woa01_seasonal_surf.nc</file>
+ <file>/mnt/C/svn/oceano/lib/matlab/woa05_annual_surf.nc</file>
+ <file>/mnt/C/svn/oceano/lib/matlab/woa05_monthly_surf.nc</file>
+ <file>/mnt/C/svn/oceano/lib/matlab/woa05_seasonal_surf.nc</file>
<file>${PROJECT_ROOT}/@dynaload</file>
<file>${PROJECT_ROOT}/@hashtable</file>
<file>${PROJECT_ROOT}/@netcdf_native</file>
@@ -77,34 +77,26 @@
<file>${PROJECT_ROOT}/@tsg_nc</file>
<file>${PROJECT_ROOT}/tsg_data/touc0904.btl</file>
<file>${PROJECT_ROOT}/tsg_data/touc0904.lbv</file>
- <file>${PROJECT_ROOT}/tsg_data/touc0904.log</file>
<file>${PROJECT_ROOT}/tsg_data/touc0904.nc</file>
<file>${PROJECT_ROOT}/tsg_data/touc0904.tsgqc</file>
<file>${PROJECT_ROOT}/tsg_icon</file>
- <file>${PROJECT_ROOT}/tsg_icon/Thermo.jpg</file>
<file>${PROJECT_ROOT}/tsg_io</file>
<file>${PROJECT_ROOT}/tsg_tools</file>
<file>${PROJECT_ROOT}/tsg_util</file>
</fileset.resources>
<fileset.package />
<build-deliverables>
- <file name="readme.txt" location="${PROJECT_ROOT}/tsgqc_linux/distrib" optional="true">/home/graal/jgrelet/svn/tsg-qc/trunk/tsgqc_linux/distrib/readme.txt</file>
- <file name="tsgqc_linux" location="${PROJECT_ROOT}/tsgqc_linux/distrib" optional="false">/home/graal/jgrelet/svn/tsg-qc/trunk/tsgqc_linux/distrib/tsgqc_linux</file>
- <file name="run_tsgqc_linux.sh" location="${PROJECT_ROOT}/tsgqc_linux/distrib" optional="false">/home/graal/jgrelet/svn/tsg-qc/trunk/tsgqc_linux/distrib/run_tsgqc_linux.sh</file>
+ <file name="run_tsgqc_linux.sh" location="${PROJECT_ROOT}/tsgqc_linux/distrib" optional="false">/mnt/C/svn/tsg-qc/trunk/tsgqc_linux/distrib/run_tsgqc_linux.sh</file>
+ <file name="readme.txt" location="${PROJECT_ROOT}/tsgqc_linux/distrib" optional="true">/mnt/C/svn/tsg-qc/trunk/tsgqc_linux/distrib/readme.txt</file>
+ <file name="tsgqc_linux" location="${PROJECT_ROOT}/tsgqc_linux/distrib" optional="false">/mnt/C/svn/tsg-qc/trunk/tsgqc_linux/distrib/tsgqc_linux</file>
</build-deliverables>
<workflow />
<matlab>
- <root>/opt/matlab/matlab_r2011b</root>
+ <root>/opt/matlab/R2011b</root>
<path>
- <directory>/home/graal/jgrelet/matlab</directory>
- <directory>/home/graal/jgrelet/svn/tsg-qc/trunk</directory>
- <directory>/home/graal/jgrelet/svn/oceano/matlab</directory>
- <directory>/home/graal/jgrelet/svn/oceano/lib/matlab</directory>
- <directory>/home/graal/jgrelet/matlab/toolbox/matlab_xunit/xunit</directory>
- <directory>/home/graal/jgrelet/matlab/toolbox/seawater</directory>
- <directory>/home/graal/jgrelet/matlab/toolbox/m_map</directory>
- <directory>/home/graal/jgrelet/matlab/toolbox/nansuite</directory>
- <directory>${MATLAB_ROOT}/toolbox/matlab/demos</directory>
+ <directory>/home/jgrelet/Documents/MATLAB</directory>
+ <directory>/C/Users/jgrelet/Documents/MATLAB/toolbox/m_map</directory>
+ <directory>/C/svn/tsg-qc/trunk</directory>
<directory>${MATLAB_ROOT}/toolbox/matlab/graph2d</directory>
<directory>${MATLAB_ROOT}/toolbox/matlab/graph3d</directory>
<directory>${MATLAB_ROOT}/toolbox/matlab/graphics</directory>
@@ -137,19 +129,82 @@
<directory>${MATLAB_ROOT}/toolbox/matlab/datamanager</directory>
<directory>${MATLAB_ROOT}/toolbox/shared/simulink</directory>
<directory>${MATLAB_ROOT}/toolbox/shared/instrument</directory>
- <directory>${MATLAB_ROOT}/toolbox/matlab/audiovideo</directory>
+ <directory>${MATLAB_ROOT}/toolbox/matlab/demos</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/glue</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/glue/studio</directory>
+ <directory>${MATLAB_ROOT}/toolbox/simulink/simulink</directory>
+ <directory>${MATLAB_ROOT}/toolbox/simulink/blocks</directory>
<directory>${MATLAB_ROOT}/toolbox/shared/testmeaslib/general</directory>
- <directory>${MATLAB_ROOT}/toolbox/shared/testmeaslib/graphics</directory>
- <directory>${MATLAB_ROOT}/toolbox/compiler</directory>
+ <directory>${MATLAB_ROOT}/toolbox/images/imdemos</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/imageslib</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/system</directory>
+ <directory>${MATLAB_ROOT}/toolbox/matlab/timeseries</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/siglib</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/comparisons</directory>
+ <directory>${MATLAB_ROOT}/toolbox/sam/m3i</directory>
+ <directory>${MATLAB_ROOT}/toolbox/geoweb/geoweb</directory>
+ <directory>${MATLAB_ROOT}/toolbox/signal/signal</directory>
+ <directory>${MATLAB_ROOT}/toolbox/signal/sigtools</directory>
+ <directory>${MATLAB_ROOT}/toolbox/signal/sptoolgui</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/imaqlib</directory>
+ <directory>${MATLAB_ROOT}/toolbox/fixedpoint/fixedpoint</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/sldv</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/maputils</directory>
+ <directory>${MATLAB_ROOT}/toolbox/systemtest/systemtestdemos</directory>
+ <directory>${MATLAB_ROOT}/toolbox/map/mapdemos</directory>
+ <directory>${MATLAB_ROOT}/toolbox/dsp/dspdemos</directory>
<directory>${MATLAB_ROOT}/toolbox/shared/asynciolib</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/spcuilib</directory>
+ <directory>${MATLAB_ROOT}/toolbox/compiler/compilerdemos</directory>
+ <directory>${MATLAB_ROOT}/toolbox/matlab/audiovideo</directory>
+ <directory>${MATLAB_ROOT}/toolbox/systemtest/systemtest</directory>
+ <directory>${MATLAB_ROOT}/toolbox/systemtest/systemtest/removed</directory>
+ <directory>${MATLAB_ROOT}/toolbox/instrument/instrumentdemos</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/dastudio</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/dastudio/depviewer</directory>
+ <directory>${MATLAB_ROOT}/toolbox/dsp/dsp</directory>
+ <directory>${MATLAB_ROOT}/toolbox/dsp/dsputilities</directory>
+ <directory>${MATLAB_ROOT}/toolbox/dsp/dsputilities/dspinit</directory>
+ <directory>${MATLAB_ROOT}/toolbox/dsp/dsputilities/dspmex</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/filterdesignlib</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/dspblks/dspblks</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/dspblks/dspmex</directory>
+ <directory>${MATLAB_ROOT}/help/toolbox/dsp/examples</directory>
+ <directory>${MATLAB_ROOT}/toolbox/dsp/filterdesign</directory>
<directory>${MATLAB_ROOT}/toolbox/shared/eml/eml</directory>
+ <directory>${MATLAB_ROOT}/toolbox/comm/commdemos</directory>
<directory>${MATLAB_ROOT}/toolbox/shared/controllib/graphics</directory>
- <directory>${MATLAB_ROOT}/toolbox/shared/controllib/general</directory>
- <directory>${MATLAB_ROOT}/toolbox/shared/comparisons</directory>
- <directory>${MATLAB_ROOT}/toolbox/shared/rptgen</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/statslib</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/mapgeodesy</directory>
+ <directory>${MATLAB_ROOT}/toolbox/comm/comm</directory>
+ <directory>${MATLAB_ROOT}/toolbox/comm/commutilities/comminit</directory>
+ <directory>${MATLAB_ROOT}/toolbox/comm/commutilities/commmex</directory>
+ <directory>${MATLAB_ROOT}/toolbox/comm/commutilities</directory>
+ <directory>${MATLAB_ROOT}/toolbox/comm/commdeprecated</directory>
+ <directory>${MATLAB_ROOT}/help/toolbox/comm/examples</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/testconsole</directory>
+ <directory>${MATLAB_ROOT}/toolbox/compiler</directory>
<directory>${MATLAB_ROOT}/toolbox/matlab/imagesci</directory>
- <directory>${MATLAB_ROOT}/toolbox/matlab/timeseries</directory>
- <directory>${MATLAB_ROOT}/toolbox/compiler/compilerdemos</directory>
+ <directory>${MATLAB_ROOT}/toolbox/images/colorspaces</directory>
+ <directory>${MATLAB_ROOT}/toolbox/images/images</directory>
+ <directory>${MATLAB_ROOT}/toolbox/images/imuitools</directory>
+ <directory>${MATLAB_ROOT}/toolbox/images/iptformats</directory>
+ <directory>${MATLAB_ROOT}/toolbox/images/iptutils</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/testmeaslib/graphics</directory>
+ <directory>${MATLAB_ROOT}/toolbox/instrument/instrument</directory>
+ <directory>${MATLAB_ROOT}/toolbox/instrument/instrumentblks/instrumentblks</directory>
+ <directory>${MATLAB_ROOT}/toolbox/instrument/instrumentblks/instrumentmex</directory>
+ <directory>${MATLAB_ROOT}/toolbox/instrument/instrumentblks/instrumentmasks</directory>
+ <directory>${MATLAB_ROOT}/toolbox/map/map</directory>
+ <directory>${MATLAB_ROOT}/toolbox/map/mapdisp</directory>
+ <directory>${MATLAB_ROOT}/toolbox/map/mapformats</directory>
+ <directory>${MATLAB_ROOT}/toolbox/map/mapproj</directory>
+ <directory>${MATLAB_ROOT}/toolbox/map/mapdata</directory>
+ <directory>${MATLAB_ROOT}/toolbox/map/mapdata/sdts</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/testmeaslib/simulink</directory>
+ <directory>${MATLAB_ROOT}/toolbox/signal/sigdemos</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/rptgen</directory>
+ <directory>${MATLAB_ROOT}/toolbox/shared/controllib/general</directory>
</path>
</matlab>
<platform>
@@ -161,10 +216,10 @@
<vista>false</vista>
<linux>true</linux>
<solaris>false</solaris>
- <osver>2.6.38-13-generic</osver>
- <os32>false</os32>
- <os64>true</os64>
- <arch>glnxa64</arch>
+ <osver>2.6.32-31-generic</osver>
+ <os32>true</os32>
+ <os64>false</os64>
+ <arch>glnx86</arch>
<matlab>true</matlab>
</platform>
</configuration>
diff --git a/tsgqc_windows.prj b/tsgqc_windows.prj
index a5015f6..fd16f96 100644
--- a/tsgqc_windows.prj
+++ b/tsgqc_windows.prj
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment-project>
- <configuration target="target.standalone.win" target-name="Windows Standalone Application" name="tsgqc" location="C:\svn\tsg-qc\trunk" file="C:\svn\tsg-qc\trunk\tsgqc.prj" preferred-package-type="package.type.exe" build-checksum="1843159723" preferred-package-location="C:\svn\tsg-qc\trunk\tsgqc">
- <param.project.name>C:\svn\tsg-qc\trunk\tsgqc.prj</param.project.name>
+ <configuration target="target.standalone.win" target-name="Windows Standalone Application" name="tsgqc_windows" location="C:\svn\tsg-qc\trunk" file="C:\svn\tsg-qc\trunk\tsgqc_windows.prj" preferred-package-type="package.type.exe" build-checksum="1133040602" preferred-package-location="C:\svn\tsg-qc\trunk\tsgqc">
+ <param.project.name>C:\svn\tsg-qc\trunk\tsgqc_windows.prj</param.project.name>
<param.target.type>Windows Standalone Application</param.target.type>
- <param.appname>tsgqc</param.appname>
- <param.intermediate>${PROJECT_ROOT}\tsgqc\src</param.intermediate>
- <param.output>${PROJECT_ROOT}\tsgqc\distrib</param.output>
+ <param.appname>tsgqc_windows</param.appname>
+ <param.intermediate>${PROJECT_ROOT}\tsgqc_windows\src</param.intermediate>
+ <param.output>${PROJECT_ROOT}\tsgqc_windows\distrib</param.output>
<param.embed.ctf>true</param.embed.ctf>
<param.tbx_on_path>
<item>all</item>
@@ -73,6 +73,7 @@
<file>${PROJECT_ROOT}\@node</file>
<file>${PROJECT_ROOT}\@stack</file>
<file>${PROJECT_ROOT}\@tsg_nc</file>
+ <file>${PROJECT_ROOT}\@tsg_nc\tsg_platform.csv</file>
<file>${PROJECT_ROOT}\tsg_data\touc0904.btl</file>
<file>${PROJECT_ROOT}\tsg_data\touc0904.lbv</file>
<file>${PROJECT_ROOT}\tsg_data\touc0904.nc</file>
@@ -90,25 +91,13 @@
<file special-file="file.mcr" reference-mode="direct">${MATLAB_ROOT}\toolbox\compiler\deploy\win32\MCRInstaller.exe</file>
</fileset.package>
<build-deliverables>
- <file name="readme.txt" location="${PROJECT_ROOT}\tsgqc\distrib" optional="true">C:\svn\tsg-qc\trunk\tsgqc\distrib\readme.txt</file>
- <file name="tsgqc.exe" location="${PROJECT_ROOT}\tsgqc\distrib" optional="false">C:\svn\tsg-qc\trunk\tsgqc\distrib\tsgqc.exe</file>
+ <file name="readme.txt" location="${PROJECT_ROOT}\tsgqc_windows\distrib" optional="true">C:\svn\tsg-qc\trunk\tsgqc_windows\distrib\readme.txt</file>
+ <file name="tsgqc_windows.exe" location="${PROJECT_ROOT}\tsgqc_windows\distrib" optional="false">C:\svn\tsg-qc\trunk\tsgqc_windows\distrib\tsgqc_windows.exe</file>
</build-deliverables>
<workflow />
<matlab>
<root>C:\Program Files (x86)\MATLAB\R2011b</root>
<path>
- <directory>C:\Users\jgrelet\Documents\MATLAB</directory>
- <directory>C:\svn\oceano\lib\matlab</directory>
- <directory>C:\svn\oceano\matlab</directory>
- <directory>C:\svn\oceano\matlab\us191</directory>
- <directory>C:\Users\jgrelet\Documents\MATLAB\toolbox\matlab_xunit\xunit</directory>
- <directory>C:\svn\datagui\trunk</directory>
- <directory>C:\svn\ladcp-ldeo\trunk\m</directory>
- <directory>C:\Users\jgrelet\Documents\MATLAB\toolbox\mbed</directory>
- <directory>C:\svn\tsg-qc\trunk</directory>
- <directory>C:\Users\jgrelet\Documents\MATLAB\toolbox\seawater</directory>
- <directory>C:\Users\jgrelet\Documents\MATLAB\toolbox\m_map</directory>
- <directory>C:\Users\jgrelet\Documents\MATLAB\toolbox</directory>
<directory>${MATLAB_ROOT}\toolbox\matlab\demos</directory>
<directory>${MATLAB_ROOT}\toolbox\matlab\graph2d</directory>
<directory>${MATLAB_ROOT}\toolbox\matlab\graph3d</directory>
--
GitLab