Mercurial > hg > fxanalyse

changeset 31:4a1378ac1b8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New build. Update project files
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Tue, 02 Oct 2012 19:13:20 +0200
parents 56095062acd4
children 3ea9fb26ecdf
files FXAnalyse.cdb FXAnalyse.cds FXAnalyse.cws
diffstat 3 files changed, 125 insertions(+), 109 deletions(-) [+]
line wrap: on
line diff
Binary file FXAnalyse.cdb has changed
--- a/FXAnalyse.cds	Tue Oct 02 19:05:58 2012 +0200
+++ b/FXAnalyse.cds	Tue Oct 02 19:13:20 2012 +0200
@@ -6,29 +6,29 @@
 		<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="true" version="7.1.12">
+		<general appName="FXAnalyse" outputLocation="p:\nicolodi\FXAnalyse\cvidistkit.FXAnalyse" relOutputLocation="cvidistkit.FXAnalyse" outputLocationWithVars="p:\nicolodi\FXAnalyse\cvidistkit.%name" relOutputLocationWithVars="cvidistkit.%name" upgradeBehavior="1" autoIncrement="true" version="7.1.15">
 			<arp company="" companyURL="" supportURL="" contact="" phone="" comments=""/>
 			<summary title="" subject="" keyWords="" comments="" author=""/></general>
 		<userinterface language="English" showPaths="true" readMe="" license="">
 			<dlgstrings welcomeTitle="FXAnalyse" welcomeText=""/></userinterface>
-		<dirs appDirID="100">
+		<dirs appDirID="101">
+			<installDir name="[Start&gt;&gt;Programs]" dirID="7" parentID="-1" isMSIDir="true" visible="true" unlock="false"/>
 			<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>
+			<installDir name="FXAnalyse" dirID="100" parentID="7" isMSIDir="false" visible="true" unlock="false"/>
+			<installDir name="FXAnalyse" dirID="101" parentID="2" isMSIDir="false" visible="true" unlock="false"/></dirs>
 		<files>
-			<simpleFile fileID="0" sourcePath="p:\nicolodi\FXAnalyse\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\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="2" 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="3" 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"/>
-			<simpleFile fileID="4" 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"/></files>
+			<simpleFile fileID="0" sourcePath="p:\nicolodi\FXAnalyse\FXAllan.uir" relSourcePath="FXAllan.uir" relSourceBase="0" targetDir="101" 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\muparser.dll" targetDir="101" 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\FXAnalyse.uir" relSourcePath="FXAnalyse.uir" relSourceBase="0" targetDir="101" 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\FXPlot.uir" relSourcePath="FXPlot.uir" relSourceBase="0" targetDir="101" 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\cvibuild.FXAnalyse\Release\FXAnalyse.exe" targetDir="101" 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">
+			<projectOutput targetType="0" dirID="101" projectID="0">
 				<fileID>4</fileID></projectOutput>
-			<projectDependencies dirID="100" projectID="0">
-				<fileID>0</fileID></projectDependencies></fileGroups>
+			<projectDependencies dirID="101" projectID="0">
+				<fileID>1</fileID></projectDependencies></fileGroups>
 		<shortcuts>
-			<shortcut name="FXAnalyse" targetFileID="4" destDirID="101" cmdLineArgs="" description="" runStyle="NORMAL"/></shortcuts>
+			<shortcut name="FXAnalyse" targetFileID="4" destDirID="100" cmdLineArgs="" description="" runStyle="NORMAL"/></shortcuts>
 		<mergemodules/>
 		<products/>
 		<runtimeEngine cvirte="true" instrsup="false" lvrt="false" analysis="false" netvarsup="false" dotnetsup="false" activeXsup="false" lowlevelsup="false" rtutilsup="false" installToAppDir="false"/>
@@ -47,14 +47,14 @@
 			<signDescURL></signDescURL></advanced>
 		<Projects NumProjects="1">
 			<Project000 ProjectID="0" ProjectAbsolutePath="p:\nicolodi\FXAnalyse\FXAnalyse.prj" ProjectRelativePath="FXAnalyse.prj"/></Projects>
-		<buildData progressBarRate="3.199045502580353">
+		<buildData progressBarRate="3.198744082931869">
 			<progressTimes>
 				<Begin>0.000000000000000</Begin>
-				<ProductsAdded>0.297250735595860</ProductsAdded>
-				<DPConfigured>3.412774835815581</DPConfigured>
-				<DPMergeModulesAdded>15.219883811035109</DPMergeModulesAdded>
-				<DPClosed>20.572382428955084</DPClosed>
-				<DistributionsCopied>20.893255114624157</DistributionsCopied>
-				<End>31.259324045044028</End></progressTimes></buildData>
+				<ProductsAdded>0.234454216949496</ProductsAdded>
+				<DPConfigured>3.211395979476948</DPConfigured>
+				<DPMergeModulesAdded>14.774792226379393</DPMergeModulesAdded>
+				<DPClosed>20.406347678619387</DPClosed>
+				<DistributionsCopied>20.715210139328011</DistributionsCopied>
+				<End>31.262269630630509</End></progressTimes></buildData>
 	</msi>
 </distribution>
--- a/FXAnalyse.cws	Tue Oct 02 19:05:58 2012 +0200
+++ b/FXAnalyse.cws	Tue Oct 02 19:13:20 2012 +0200
@@ -14,10 +14,10 @@
 Active Project = 1
 Project 0001 = "FXAnalyse.prj"
 Drag Bar Left = 335
-Window Top = 34
-Window Left = 62
-Window Bottom = 882
-Window Right = 1647
+Window Top = 87
+Window Left = 66
+Window Bottom = 935
+Window Right = 1651
 Maximized = False
 Maximized Children = True
 Max32 Number Of Errors = 20
@@ -30,7 +30,7 @@
 Hide Windows = False
 Break At First Statement = False
 Sort Type = "File Name"
-Number of Opened Files = 10
+Number of Opened Files = 13
 Window Confinement Region Enabled = True
 MainColumnWidth = 318
 FileDateColumnWidth = 70
@@ -45,33 +45,53 @@
 Build Platform = "Intel 32-bit"
 Warn User If Debugging Release = 1
 Batch Build Release = False
-Batch Build Debug = False
+Batch Build Debug = True
 Force Rebuild = False
 
 [File 0001]
 Path = "/p/nicolodi/FXAnalyse/FXAnalyse.c"
 File Type = "CSource"
-Disk Date = 3425473452
+Disk Date = 3432042233
 In Projects = "1,"
 Window Top = 32
 Window Left = 6
 Window Z-Order = 1
-Source Window State = "1,2924,2924,2924,62,68,62,0,0,173,0,2901,0,0,0,41,381,0,401,8,349,671,1,13,"
+Source Window State = "1,2670,2686,2670,0,0,0,0,0,151,0,0,0,0,0,38,2649,0,2670,0,401,685,1,0,"
 
 [File 0002]
-Path = "/p/nicolodi/FXAnalyse/FXAnalyse.h"
-File Type = "Include"
-Disk Date = 3425472737
+Path = "/m/mes documents/Téléchargements/DDSdrivers/DDS4xAD9912.c"
+File Type = "CSource"
+Disk Date = 3398777284
+In Projects = ""
+Window Top = 32
+Window Left = 6
+Window Z-Order = 13
+Source Window State = "1,53,53,53,53,59,59,0,3,80,0,0,0,0,0,21,0,0,53,53,349,683,1,0,"
+
+[File 0003]
+Path = "/p/nicolodi/FXAnalyse/future.c"
+File Type = "CSource"
+Disk Date = 3425474807
 In Projects = "1,"
 Window Top = 32
 Window Left = 6
-Window Z-Order = 3
-Source Window State = "1,26,26,26,9,24,24,0,3,92,0,0,0,0,0,23,9,0,26,9,349,683,1,0,"
+Window Z-Order = 9
+Source Window State = "1,1,1,1,0,25,0,0,0,70,0,0,0,0,0,23,0,0,4,19,375,601,1,0,"
 
-[File 0003]
+[File 0004]
+Path = "/p/nicolodi/FXAnalyse/FXAnalyse.h"
+File Type = "Include"
+Disk Date = 3432037058
+In Projects = "1,"
+Window Top = 32
+Window Left = 6
+Window Z-Order = 4
+Source Window State = "1,26,26,26,9,24,24,0,0,80,0,0,0,0,0,21,0,0,27,37,349,683,1,0,"
+
+[File 0005]
 Path = "/p/nicolodi/FXAnalyse/FXAnalyse.uir"
 File Type = "User Interface Resource"
-Disk Date = 3425472737
+Disk Date = 3432037058
 In Projects = "1,"
 Window Top = 92
 Window Left = 38
@@ -79,17 +99,17 @@
 Window Width = 683
 Window Z-Order = 2
 
-[File 0004]
+[File 0006]
 Path = "/p/nicolodi/FXAnalyse/DDS_Fox.c"
 File Type = "CSource"
 Disk Date = 3425281298
 In Projects = "1,"
 Window Top = 62
 Window Left = 22
-Window Z-Order = 10
-Source Window State = "1,298,298,298,8,14,14,1,0,90,0,0,0,0,0,23,25,0,45,20,349,671,1,0,"
+Window Z-Order = 3
+Source Window State = "1,270,270,270,15,24,24,0,3,79,0,0,0,0,0,21,240,0,270,15,349,671,1,0,"
 
-[File 0005]
+[File 0007]
 Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.c"
 File Type = "CSource"
 Disk Date = 3424165960
@@ -97,153 +117,149 @@
 Window Top = 32
 Window Left = 6
 Window Z-Order = 6
-Source Window State = "1,0,0,0,0,0,0,0,0,77,0,0,0,0,0,25,151,0,176,11,375,580,1,0,"
+Source Window State = "1,0,0,0,0,0,0,0,0,67,0,0,0,0,0,23,0,0,176,11,375,580,1,0,"
 
-[File 0006]
+[File 0008]
 Path = "/p/nicolodi/FXAnalyse/Allan.c"
 File Type = "CSource"
 Disk Date = 3424165960
 In Projects = "1,"
 Window Top = 122
 Window Left = 54
+Window Z-Order = 8
+Source Window State = "1,50,50,50,0,11,11,0,0,70,0,0,0,0,0,23,41,0,50,8,375,601,1,0,"
+
+[File 0009]
+Path = "/p/nicolodi/FXAnalyse/DDSBes.c"
+File Type = "CSource"
+Disk Date = 3424165960
+In Projects = "1,"
+Window Top = 152
+Window Left = 70
+Window Z-Order = 11
+Source Window State = "1,0,0,0,0,0,0,0,0,70,0,0,0,0,0,23,143,0,147,29,375,601,1,0,"
+
+[File 0010]
+Path = "/c/Program Files/National Instruments/CVI2009/include/userint.h"
+File Type = "Include"
+Disk Date = 3346736400
+In Projects = ""
+Window Top = 92
+Window Left = 38
+Window Z-Order = 10
+Source Window State = "1,2067,2067,2067,61,80,61,0,0,70,0,0,0,0,0,23,2050,0,2065,51,375,601,1,0,"
+
+[File 0011]
+Path = "/p/nicolodi/FXAnalyse/future.h"
+File Type = "Include"
+Disk Date = 3425459276
+In Projects = "1,"
+Window Top = 92
+Window Left = 38
+Window Z-Order = 12
+Source Window State = "1,0,0,0,0,0,0,0,0,70,0,0,0,0,0,23,0,0,0,0,375,601,1,0,"
+
+[File 0012]
+Path = "/p/nicolodi/FXAnalyse/Plot.c"
+File Type = "CSource"
+Disk Date = 3425564517
+In Projects = "1,"
+Window Top = 122
+Window Left = 54
 Window Z-Order = 7
-Source Window State = "1,50,50,50,0,11,11,0,0,80,0,0,0,0,0,25,253,0,275,84,375,601,1,0,"
+Source Window State = "1,53,53,53,0,23,23,0,0,70,0,0,0,0,0,23,5,0,50,15,375,601,1,0,"
 
-[File 0007]
+[File 0013]
+Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.h"
+File Type = "Include"
+Disk Date = 3424165960
+In Projects = "1,"
+Window Top = 32
+Window Left = 6
+Window Z-Order = 5
+Source Window State = "1,31,36,31,16,28,16,0,0,80,0,0,0,0,0,21,0,0,23,67,349,683,1,0,"
+
+[File 0014]
 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 0008]
-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 0009]
+[File 0015]
 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,"
-Window Top = 152
-Window Left = 70
-Window Z-Order = 5
-Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,143,0,147,29,375,601,1,0,"
-
-[File 0011]
+[File 0016]
 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]
+[File 0017]
 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]
+[File 0018]
 Path = "/p/nicolodi/FXAnalyse/FXAllan.uir"
 File Type = "User Interface Resource"
 Disk Date = 3424165960
 In Projects = "1,"
 
-[File 0014]
+[File 0019]
 Path = "/p/nicolodi/FXAnalyse/FXPlot.h"
 File Type = "Include"
 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]
+[File 0020]
 Path = "/p/nicolodi/FXAnalyse/FXPlot.uir"
 File Type = "User Interface Resource"
 Disk Date = 3424165961
 In Projects = "1,"
 
-[File 0016]
+[File 0021]
 Path = "/p/nicolodi/FXAnalyse/muParser.lib"
 File Type = "Library"
 Disk Date = 3424165962
 In Projects = "1,"
 
-[File 0017]
+[File 0022]
 Path = "/p/nicolodi/FXAnalyse/muParserDLL.h"
 File Type = "Include"
 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 = "/p/nicolodi/FXAnalyse/Plot.c"
-File Type = "CSource"
-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]
+[File 0023]
 Path = "/p/nicolodi/FXAnalyse/Plot.h"
 File Type = "Include"
 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]
+[File 0024]
 Path = "/p/nicolodi/FXAnalyse/YLCStuff.c"
 File Type = "CSource"
 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]
+[File 0025]
 Path = "/p/nicolodi/FXAnalyse/YLCStuff.h"
 File Type = "Include"
 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 0022]
-Path = "/c/Program Files/National Instruments/CVI2009/include/userint.h"
-File Type = "Include"
-Disk Date = 3346736400
-In Projects = ""
-Window Top = 92
-Window Left = 38
-Window Z-Order = 4
-Source Window State = "1,2067,2067,2067,61,80,61,0,0,80,0,0,0,0,0,25,2050,0,2065,51,375,601,1,0,"
-
-[File 0023]
-Path = "/p/nicolodi/FXAnalyse/future.c"
-File Type = "CSource"
-Disk Date = 3425459345
-In Projects = "1,"
-Window Top = 62
-Window Left = 22
-Window Z-Order = 9
-Source Window State = "1,3,3,3,0,22,0,0,3,80,0,1,0,1,0,25,0,0,3,22,375,601,1,0,"
-
-[File 0024]
-Path = "/p/nicolodi/FXAnalyse/future.h"
-File Type = "Include"
-Disk Date = 3425459276
-In Projects = "1,"
-Window Top = 92
-Window Left = 38
-Window Z-Order = 8
-Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,375,601,1,0,"
-
 [Build Options 0001]
 Generate Browse Info = True
 Enable Uninitialized Locals Runtime Warning = True