Mercurial > hg > fxanalyse
changeset 15:b2103439b401
New build
author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
---|---|
date | Mon, 16 Jul 2012 13:17:01 +0200 |
parents | 783407954cdf |
children | 9d57d1fcbcd5 |
files | FXAnalyse.cdb FXAnalyse.cds FXAnalyse.cws FXAnalyse.prj |
diffstat | 4 files changed, 67 insertions(+), 87 deletions(-) [+] |
line wrap: on
line diff
--- a/FXAnalyse.cds Mon Jul 16 13:15:30 2012 +0200 +++ b/FXAnalyse.cds Mon Jul 16 13:17:01 2012 +0200 @@ -6,7 +6,7 @@ <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.4"> + <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.5"> <arp company="" companyURL="" supportURL="" contact="" phone="" comments=""/> <summary title="" subject="" keyWords="" comments="" author=""/></general> <userinterface language="English" showPaths="true" readMe="" license=""> @@ -17,7 +17,7 @@ <installDir name="[Start>>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\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="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"/> @@ -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="2.658686104097001"> + <buildData progressBarRate="3.104281851640971"> <progressTimes> <Begin>0.000000000000000</Begin> - <ProductsAdded>0.159936312500001</ProductsAdded> - <DPConfigured>2.024445968750001</DPConfigured> - <DPMergeModulesAdded>17.344759625000002</DPMergeModulesAdded> - <DPClosed>23.535382812500004</DPClosed> - <DistributionsCopied>23.976009343749997</DistributionsCopied> - <End>37.612563531250004</End></progressTimes></buildData> + <ProductsAdded>0.136354156250001</ProductsAdded> + <DPConfigured>4.043607984375001</DPConfigured> + <DPMergeModulesAdded>15.953766812500000</DPMergeModulesAdded> + <DPClosed>20.674075906250000</DPClosed> + <DistributionsCopied>21.044390671874993</DistributionsCopied> + <End>32.213569765625003</End></progressTimes></buildData> </msi> </distribution>
--- a/FXAnalyse.cws Mon Jul 16 13:15:30 2012 +0200 +++ b/FXAnalyse.cws Mon Jul 16 13:17:01 2012 +0200 @@ -14,11 +14,11 @@ Active Project = 1 Project 0001 = "FXAnalyse.prj" Drag Bar Left = 335 -Window Top = 157 -Window Left = 442 -Window Bottom = 625 -Window Right = 1224 -Maximized = True +Window Top = 22 +Window Left = 24 +Window Bottom = 870 +Window Right = 1609 +Maximized = False Maximized Children = True Max32 Number Of Errors = 20 Track Include File Dependencies = True @@ -30,7 +30,7 @@ Hide Windows = False Break At First Statement = False Sort Type = "File Name" -Number of Opened Files = 3 +Number of Opened Files = 5 Window Confinement Region Enabled = True MainColumnWidth = 318 FileDateColumnWidth = 70 @@ -51,69 +51,72 @@ [File 0001] Path = "/p/nicolodi/FXAnalyse/FXAnalyse.c" File Type = "CSource" -Disk Date = 3424165960 +Disk Date = 3425282100 In Projects = "1," -Window Top = 62 -Window Left = 22 +Window Top = 32 +Window Left = 6 Window Z-Order = 1 -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," +Source Window State = "1,2708,2709,2708,12,12,12,0,0,151,0,0,0,0,0,56,2669,0,2702,8,349,671,1,0," [File 0002] Path = "/p/nicolodi/FXAnalyse/FXAnalyse.h" File Type = "Include" -Disk Date = 3424165961 +Disk Date = 3425014333 In Projects = "1," Window Top = 32 Window Left = 6 -Window Z-Order = 3 +Window Z-Order = 5 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 0003] Path = "/p/nicolodi/FXAnalyse/FXAnalyse.uir" File Type = "User Interface Resource" -Disk Date = 3424165961 +Disk Date = 3425014333 In Projects = "1," Window Top = 92 Window Left = 38 Window Height = 349 Window Width = 683 -Window Z-Order = 2 +Window Z-Order = 4 [File 0004] +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 = 2 +Source Window State = "1,374,374,374,5,19,19,0,0,79,0,0,0,0,0,25,321,0,484,36,349,671,1,0," + +[File 0005] 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] +[File 0006] 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] +[File 0007] 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] +[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 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" @@ -126,7 +129,10 @@ 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," +Window Top = 272 +Window Left = 134 +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 0011] Path = "/p/nicolodi/FXAnalyse/DDSBes.h"
--- a/FXAnalyse.prj Mon Jul 16 13:15:30 2012 +0200 +++ b/FXAnalyse.prj Mon Jul 16 13:17:01 2012 +0200 @@ -1,7 +1,6 @@ [Project Header] Version = 910 -Pathname Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Pathname Line0002 = "al modif bize/FXAnalyse.prj" +Pathname = "/p/nicolodi/FXAnalyse/FXAnalyse.prj" Project Label = "FXAnalyse" CVI Dir = "/c/program files/national instruments/cvi2009" CVI Shared Dir = "/C/Program Files/National Instruments/Shared/CVI" @@ -26,8 +25,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "Allan.c" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/Allan.c" +Path = "/p/nicolodi/FXAnalyse/Allan.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -39,8 +37,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "Allan.h" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/Allan.h" +Path = "/p/nicolodi/FXAnalyse/Allan.h" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -51,8 +48,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "DDS4xAD9912.c" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/DDS4xAD9912.c" +Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -64,8 +60,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "DDS4xAD9912.h" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/DDS4xAD9912.h" +Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.h" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -76,8 +71,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "DDS_Fox.c" -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/DDS_Fox.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -89,8 +83,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "DDS_Fox.h" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/DDS_Fox.h" +Path = "/p/nicolodi/FXAnalyse/DDS_Fox.h" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -101,8 +94,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "DDSBes.c" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/DDSBes.c" +Path = "/p/nicolodi/FXAnalyse/DDSBes.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -114,8 +106,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "DDSBes.h" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/DDSBes.h" +Path = "/p/nicolodi/FXAnalyse/DDSBes.h" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -126,8 +117,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "FXAllan.h" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/FXAllan.h" +Path = "/p/nicolodi/FXAnalyse/FXAllan.h" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -138,8 +128,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "FXAllan.uir" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/FXAllan.uir" +Path = "/p/nicolodi/FXAnalyse/FXAllan.uir" Exclude = False Project Flags = 0 Folder = "User Interface Files" @@ -150,8 +139,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "FXAnalyse.c" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/FXAnalyse.c" +Path = "/p/nicolodi/FXAnalyse/FXAnalyse.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -163,8 +151,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "FXAnalyse.h" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/FXAnalyse.h" +Path = "/p/nicolodi/FXAnalyse/FXAnalyse.h" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -175,8 +162,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "FXAnalyse.uir" -Path Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Path Line0002 = "al modif bize/FXAnalyse.uir" +Path = "/p/nicolodi/FXAnalyse/FXAnalyse.uir" Exclude = False Project Flags = 0 Folder = "User Interface Files" @@ -187,8 +173,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "FXPlot.h" -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" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -199,8 +184,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "FXPlot.uir" -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" Exclude = False Project Flags = 0 Folder = "User Interface Files" @@ -211,8 +195,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "muParser.lib" -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" Exclude = False Project Flags = 0 Folder = "Librairy Files" @@ -223,8 +206,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "muParserDLL.h" -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" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -235,8 +217,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "Plot.c" -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" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -248,8 +229,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "Plot.h" -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" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -260,8 +240,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "YLCStuff.c" -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" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -273,8 +252,7 @@ Path Is Rel = True Path Rel To = "Project" Path Rel Path = "YLCStuff.h" -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" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -295,7 +273,7 @@ Enable Unreferenced Identifiers Warning = False Enable Assignment In Conditional Warning = False O Option Compatible With 5.0 = False -Enable C99 Extensions = False +Enable C99 Extensions = True Uninitialized Locals Compile Warning = "Conservative" Precompile Prefix Header = False Prefix Header File = "" @@ -312,23 +290,19 @@ Executable File_Debug Is Rel = True Executable File_Debug Rel To = "Project" Executable File_Debug Rel Path = "FXAnalyse.exe" -Executable File_Debug Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Executable File_Debug Line0002 = "al modif bize/FXAnalyse.exe" +Executable File_Debug = "/p/nicolodi/FXAnalyse/FXAnalyse.exe" Executable File_Release Is Rel = True Executable File_Release Rel To = "Project" Executable File_Release Rel Path = "FXAnalyse.exe" -Executable File_Release Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Executable File_Release Line0002 = "al modif bize/FXAnalyse.exe" +Executable File_Release = "/p/nicolodi/FXAnalyse/FXAnalyse.exe" Executable File_Debug64 Is Rel = True Executable File_Debug64 Rel To = "Project" Executable File_Debug64 Rel Path = "FXAnalyse.exe" -Executable File_Debug64 Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Executable File_Debug64 Line0002 = "al modif bize/FXAnalyse.exe" +Executable File_Debug64 = "/p/nicolodi/FXAnalyse/FXAnalyse.exe" Executable File_Release64 Is Rel = True Executable File_Release64 Rel To = "Project" Executable File_Release64 Rel Path = "FXAnalyse.exe" -Executable File_Release64 Line0001 = "/p/nicolodi/blue/Sylvain/Programme FemtoSoft 4DDS + DDS Fox/FemtoSoft+DDSFOX Fin" -Executable File_Release64 Line0002 = "al modif bize/FXAnalyse.exe" +Executable File_Release64 = "/p/nicolodi/FXAnalyse/FXAnalyse.exe" Icon File Is Rel = False Icon File = "" Application Title = ""