# HG changeset patch
# User Daniele Nicolodi <daniele.nicolodi@obspm.fr>
# Date 1341321461 -7200
# Node ID 5a3099ca939792e426901f264a3eeea3e161ab10
# Parent  5549a69e1cfa0c23ef7e5c5e0d95fd312ad68404
Adjust distribution definition files

diff -r 5549a69e1cfa -r 5a3099ca9397 FXAnalyse.cds
--- a/FXAnalyse.cds	Tue Jul 03 15:10:07 2012 +0200
+++ b/FXAnalyse.cds	Tue Jul 03 15:17:41 2012 +0200
@@ -1,16 +1,51 @@
-<distribution version="8.5.0" name="FXAnalyze2" type="MSI">
-	<msi GUID="">
-		<general appName="" outputLocation="" outputLocationWithVars="" autoIncrement="true" version="1.0.0">
+<distribution version="9.1.0" name="FXAnalyse" type="MSI">
+	<prebuild>
+		<workingdir>workspacedir</workingdir>
+		<actions></actions></prebuild>
+	<postbuild>
+		<workingdir>workspacedir</workingdir>
+		<actions></actions></postbuild>
+	<msi GUID="{B33DEF13-BB3E-4080-AE98-C5CCC94A66DC}">
+		<general appName="FXAnalyse" outputLocation="p:\nicolodi\FXAnalyse\cvidistkit.FXAnalyse" relOutputLocation="cvidistkit.FXAnalyse" outputLocationWithVars="p:\nicolodi\FXAnalyse\cvidistkit.%name" relOutputLocationWithVars="cvidistkit.%name" upgradeBehavior="1" autoIncrement="false" version="7.1.0">
 			<arp company="" companyURL="" supportURL="" contact="" phone="" comments=""/>
 			<summary title="" subject="" keyWords="" comments="" author=""/></general>
-		<userinterface language="" readMe="" license=""><dlgstrings welcomeTitle="" welcomeText="">
-			</dlgstrings></userinterface>
+		<userinterface language="English" showPaths="true" readMe="" license="">
+			<dlgstrings welcomeTitle="FXAnalyse" welcomeText=""/></userinterface>
+		<dirs appDirID="100">
+			<installDir name="[Program Files]" dirID="2" parentID="-1" isMSIDir="true" visible="true" unlock="false"/>
+			<installDir name="FXAnalyse" dirID="100" parentID="2" isMSIDir="false" visible="true" unlock="false"/>
+			<installDir name="[Start&gt;&gt;Programs]" dirID="7" parentID="-1" isMSIDir="true" visible="true" unlock="false"/>
+			<installDir name="FXAnalyse" dirID="101" parentID="7" isMSIDir="false" visible="true" unlock="false"/></dirs>
+		<files>
+			<simpleFile fileID="0" sourcePath="p:\nicolodi\blue\Sylvain\Programme FemtoSoft 4DDS + DDS Fox\FemtoSoft+DDSFOX Final modif bize\muParser.dll" targetDir="100" readonly="false" hidden="false" system="false" regActiveX="false" runAfterInstallStyle="IMMEDIATELY_RESUME_INSTALL" cmdLineArgs="" runAfterInstall="false" uninstCmdLnArgs="" runUninst="false"/>
+			<simpleFile fileID="1" sourcePath="p:\nicolodi\FXAnalyse\cvibuild.FXAnalyse\Release\FXAnalyse.exe" targetDir="100" readonly="false" hidden="false" system="false" regActiveX="false" runAfterInstallStyle="IMMEDIATELY_RESUME_INSTALL" cmdLineArgs="" runAfterInstall="false" uninstCmdLnArgs="" runUninst="false"/>
+			<simpleFile fileID="2" sourcePath="p:\nicolodi\FXAnalyse\FXAllan.uir" relSourcePath="FXAllan.uir" relSourceBase="0" targetDir="100" readonly="false" hidden="false" system="false" regActiveX="false" runAfterInstallStyle="IMMEDIATELY_RESUME_INSTALL" cmdLineArgs="" runAfterInstall="false" uninstCmdLnArgs="" runUninst="false"/>
+			<simpleFile fileID="3" sourcePath="p:\nicolodi\FXAnalyse\FXAnalyse.uir" relSourcePath="FXAnalyse.uir" relSourceBase="0" targetDir="100" readonly="false" hidden="false" system="false" regActiveX="false" runAfterInstallStyle="IMMEDIATELY_RESUME_INSTALL" cmdLineArgs="" runAfterInstall="false" uninstCmdLnArgs="" runUninst="false"/>
+			<simpleFile fileID="4" sourcePath="p:\nicolodi\FXAnalyse\FXPlot.uir" relSourcePath="FXPlot.uir" relSourceBase="0" targetDir="100" readonly="false" hidden="false" system="false" regActiveX="false" runAfterInstallStyle="IMMEDIATELY_RESUME_INSTALL" cmdLineArgs="" runAfterInstall="false" uninstCmdLnArgs="" runUninst="false"/></files>
+		<fileGroups>
+			<projectOutput targetType="0" dirID="100" projectID="0">
+				<fileID>1</fileID></projectOutput>
+			<projectDependencies dirID="100" projectID="0">
+				<fileID>0</fileID></projectDependencies></fileGroups>
+		<shortcuts>
+			<shortcut name="FXAnalyse" targetFileID="1" destDirID="101" cmdLineArgs="" description="" runStyle="NORMAL"/></shortcuts>
 		<mergemodules/>
-		<runtimeEngine cvirte="true" instrsup="true" lvrt="true" analysis="true" netvarsup="true" dotnetsup="true" activeXsup="true" lowlevelsup="true" rtutilsup="true" installToAppDir="false"/>
-		<advanced mediaSize="0">
+		<products/>
+		<runtimeEngine cvirte="true" instrsup="false" lvrt="false" analysis="false" netvarsup="false" dotnetsup="false" activeXsup="false" lowlevelsup="false" rtutilsup="false" installToAppDir="false"/>
+		<advanced mediaSize="650">
+			<launchConditions>
+				<condition>MINOS_WIN2K_SP3</condition>
+			</launchConditions>
 			<includeConfigProducts>true</includeConfigProducts>
 			<maxImportVisible>silent</maxImportVisible>
-			<maxImportMode>merge</maxImportMode></advanced>
-		<Projects NumProjects="0"/>
+			<maxImportMode>merge</maxImportMode>
+			<custMsgFlag>false</custMsgFlag>
+			<custMsgPath>c:\program files\national instruments\cvi2009\bin\msgrte.txt</custMsgPath>
+			<signExe>false</signExe>
+			<certificate></certificate>
+			<signTimeURL></signTimeURL>
+			<signDescURL></signDescURL></advanced>
+		<Projects NumProjects="1">
+			<Project000 ProjectID="0" ProjectAbsolutePath="p:\nicolodi\FXAnalyse\FXAnalyse.prj" ProjectRelativePath="FXAnalyse.prj"/></Projects>
 	</msi>
 </distribution>
diff -r 5549a69e1cfa -r 5a3099ca9397 FXAnalyse.cws
--- a/FXAnalyse.cws	Tue Jul 03 15:10:07 2012 +0200
+++ b/FXAnalyse.cws	Tue Jul 03 15:17:41 2012 +0200
@@ -1,7 +1,6 @@
 [Workspace Header]
 Version = 910
-Pathname Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Pathname Line0002 = "al modif bize/FXAnalyse.cws"
+Pathname = "/p/nicolodi/FXAnalyse/FXAnalyse.cws"
 CVI Dir = "/c/program files/national instruments/cvi2009"
 CVI Shared Dir = "/C/Program Files/National Instruments/Shared/CVI"
 CVI Pub Local Dir Line0001 = "/C/Documents and Settings/All Users/Application Data/National Instruments/CVI200"
@@ -50,111 +49,29 @@
 Force Rebuild = False
 
 [File 0001]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/Allan.c"
-File Type = "CSource"
-Disk Date = 3342617652
-In Projects = "1,"
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
-
-[File 0002]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/Allan.h"
-File Type = "Include"
-Disk Date = 3319553856
-In Projects = "1,"
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
-
-[File 0003]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/DDS4xAD9912.c"
-File Type = "CSource"
-Disk Date = 3398774847
-In Projects = "1,"
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
-
-[File 0004]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/DDS4xAD9912.h"
-File Type = "Include"
-Disk Date = 3398774404
-In Projects = "1,"
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
-
-[File 0005]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/DDS_Fox.c"
+Path = "/p/nicolodi/FXAnalyse/FXAnalyse.c"
 File Type = "CSource"
-Disk Date = 3424163308
-In Projects = "1,"
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
-
-[File 0006]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/DDS_Fox.h"
-File Type = "Include"
-Disk Date = 3389621367
-In Projects = "1,"
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
-
-[File 0007]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/DDSBes.c"
-File Type = "CSource"
-Disk Date = 3370584710
-In Projects = "1,"
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
-
-[File 0008]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/DDSBes.h"
-File Type = "Include"
-Disk Date = 3355477284
-In Projects = "1,"
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
-
-[File 0009]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/FXAllan.h"
-File Type = "Include"
-Disk Date = 3355142120
-In Projects = "1,"
-Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
-
-[File 0010]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/FXAllan.uir"
-File Type = "User Interface Resource"
-Disk Date = 3369722096
-In Projects = "1,"
-
-[File 0011]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/FXAnalyse.c"
-File Type = "CSource"
-Disk Date = 3424164862
+Disk Date = 3424165960
 In Projects = "1,"
 Window Top = 62
 Window Left = 22
 Window Z-Order = 1
-Source Window State = "1,1306,1306,1306,50,55,55,0,0,163,0,0,0,0,0,56,1284,0,1309,73,349,683,1,0,"
+Source Window State = "1,1306,1306,1306,50,55,55,0,0,163,0,0,0,0,0,67,1110,0,1309,73,349,683,1,0,"
 
-[File 0012]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/FXAnalyse.h"
+[File 0002]
+Path = "/p/nicolodi/FXAnalyse/FXAnalyse.h"
 File Type = "Include"
-Disk Date = 3424158381
+Disk Date = 3424165961
 In Projects = "1,"
 Window Top = 32
 Window Left = 6
 Window Z-Order = 3
 Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,349,683,1,0,"
 
-[File 0013]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/FXAnalyse.uir"
+[File 0003]
+Path = "/p/nicolodi/FXAnalyse/FXAnalyse.uir"
 File Type = "User Interface Resource"
-Disk Date = 3424163770
+Disk Date = 3424165961
 In Projects = "1,"
 Window Top = 92
 Window Left = 38
@@ -162,65 +79,126 @@
 Window Width = 683
 Window Z-Order = 2
 
+[File 0004]
+Path = "/p/nicolodi/FXAnalyse/Allan.c"
+File Type = "CSource"
+Disk Date = 3424165960
+In Projects = "1,"
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+
+[File 0005]
+Path = "/p/nicolodi/FXAnalyse/Allan.h"
+File Type = "Include"
+Disk Date = 3424165960
+In Projects = "1,"
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+
+[File 0006]
+Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.c"
+File Type = "CSource"
+Disk Date = 3424165960
+In Projects = "1,"
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+
+[File 0007]
+Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.h"
+File Type = "Include"
+Disk Date = 3424165960
+In Projects = "1,"
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+
+[File 0008]
+Path = "/p/nicolodi/FXAnalyse/DDS_Fox.c"
+File Type = "CSource"
+Disk Date = 3424165960
+In Projects = "1,"
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+
+[File 0009]
+Path = "/p/nicolodi/FXAnalyse/DDS_Fox.h"
+File Type = "Include"
+Disk Date = 3424165960
+In Projects = "1,"
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+
+[File 0010]
+Path = "/p/nicolodi/FXAnalyse/DDSBes.c"
+File Type = "CSource"
+Disk Date = 3424165960
+In Projects = "1,"
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+
+[File 0011]
+Path = "/p/nicolodi/FXAnalyse/DDSBes.h"
+File Type = "Include"
+Disk Date = 3424165960
+In Projects = "1,"
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+
+[File 0012]
+Path = "/p/nicolodi/FXAnalyse/FXAllan.h"
+File Type = "Include"
+Disk Date = 3424165960
+In Projects = "1,"
+Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
+
+[File 0013]
+Path = "/p/nicolodi/FXAnalyse/FXAllan.uir"
+File Type = "User Interface Resource"
+Disk Date = 3424165960
+In Projects = "1,"
+
 [File 0014]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/FXPlot.h"
+Path = "/p/nicolodi/FXAnalyse/FXPlot.h"
 File Type = "Include"
-Disk Date = 3383805014
+Disk Date = 3424165961
 In Projects = "1,"
 Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
 [File 0015]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/FXPlot.uir"
+Path = "/p/nicolodi/FXAnalyse/FXPlot.uir"
 File Type = "User Interface Resource"
-Disk Date = 3383805014
+Disk Date = 3424165961
 In Projects = "1,"
 
 [File 0016]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/muParser.lib"
+Path = "/p/nicolodi/FXAnalyse/muParser.lib"
 File Type = "Library"
-Disk Date = 3266256404
+Disk Date = 3424165962
 In Projects = "1,"
 
 [File 0017]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/muParserDLL.h"
+Path = "/p/nicolodi/FXAnalyse/muParserDLL.h"
 File Type = "Include"
-Disk Date = 3301904986
+Disk Date = 3424165962
 In Projects = "1,"
 Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
 [File 0018]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/Plot.c"
+Path = "/p/nicolodi/FXAnalyse/Plot.c"
 File Type = "CSource"
-Disk Date = 3383804966
+Disk Date = 3424165961
 In Projects = "1,"
 Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
 [File 0019]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/Plot.h"
+Path = "/p/nicolodi/FXAnalyse/Plot.h"
 File Type = "Include"
-Disk Date = 3385632418
+Disk Date = 3424165961
 In Projects = "1,"
 Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
 [File 0020]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/YLCStuff.c"
+Path = "/p/nicolodi/FXAnalyse/YLCStuff.c"
 File Type = "CSource"
-Disk Date = 3301979202
+Disk Date = 3424165961
 In Projects = "1,"
 Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
 [File 0021]
-Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-Path Line0002 = "al modif bize/YLCStuff.h"
+Path = "/p/nicolodi/FXAnalyse/YLCStuff.h"
 File Type = "Include"
-Disk Date = 3301978486
+Disk Date = 3424165962
 In Projects = "1,"
 Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
@@ -257,8 +235,7 @@
 External Process Path = ""
 
 [DLLs Used By Executable 0001]
-DLL 0001 Line0001 = "/P/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-DLL 0001 Line0002 = "al modif bize/muparser.dll"
+DLL 0001 = "/P/nicolodi/FXAnalyse/muparser.dll"
 
 [Command Line Args 0001]
 Command Line Args = ""
@@ -266,7 +243,6 @@
 
 [Distributions]
 Active Index = 1
-AbsCDSPath 0001 Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin"
-AbsCDSPath 0001 Line0002 = "al modif bize/FXAnalyse_1.cds"
-RelCDSPath 0001 = "FXAnalyse_1.cds"
+AbsCDSPath 0001 = "/p/nicolodi/FXAnalyse/FXAnalyse.cds"
+RelCDSPath 0001 = "FXAnalyse.cds"
 
diff -r 5549a69e1cfa -r 5a3099ca9397 FXAnalyze2.cds
--- a/FXAnalyze2.cds	Tue Jul 03 15:10:07 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<distribution version="8.5.0" name="FXAnalyze2" type="MSI">
-	<msi GUID="">
-		<general appName="" outputLocation="" outputLocationWithVars="" autoIncrement="true" version="1.0.0">
-			<arp company="" companyURL="" supportURL="" contact="" phone="" comments=""/>
-			<summary title="" subject="" keyWords="" comments="" author=""/></general>
-		<userinterface language="" readMe="" license=""><dlgstrings welcomeTitle="" welcomeText="">
-			</dlgstrings></userinterface>
-		<mergemodules/>
-		<runtimeEngine cvirte="true" instrsup="true" lvrt="true" analysis="true" netvarsup="true" dotnetsup="true" activeXsup="true" lowlevelsup="true" rtutilsup="true" installToAppDir="false"/>
-		<advanced mediaSize="0">
-			<includeConfigProducts>true</includeConfigProducts>
-			<maxImportVisible>silent</maxImportVisible>
-			<maxImportMode>merge</maxImportMode></advanced>
-		<Projects NumProjects="0"/>
-	</msi>
-</distribution>