Mercurial > hg > fxanalyse
changeset 172:95f155c5bec6
New build
author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
---|---|
date | Fri, 14 Feb 2014 16:58:22 +0100 |
parents | 7d0c8319c496 |
children | 24ab61179ab5 |
files | FXAnalyse.cdb FXAnalyse.cds FXAnalyse.prj |
diffstat | 3 files changed, 142 insertions(+), 228 deletions(-) [+] |
line wrap: on
line diff
--- a/FXAnalyse.cds Fri Feb 14 16:58:19 2014 +0100 +++ b/FXAnalyse.cds Fri Feb 14 16:58:22 2014 +0100 @@ -6,32 +6,34 @@ <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.4.18"> + <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.4.34"> <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"> - <installDir name="[Start>>Programs]" dirID="7" parentID="-1" isMSIDir="true" visible="true" unlock="false"/> - <installDir name="FXAnalyse" dirID="100" parentID="2" isMSIDir="false" visible="true" unlock="false"/> - <installDir name="FXAnalyse" dirID="101" parentID="7" isMSIDir="false" visible="true" unlock="false"/> - <installDir name="[Program Files]" dirID="2" parentID="-1" isMSIDir="true" visible="true" unlock="false"/></dirs> + <dirs appDirID="101"> + <installDir name="FXAnalyse" dirID="100" parentID="7" isMSIDir="false" visible="true" unlock="false"/> + <installDir name="[Program Files]" dirID="2" parentID="-1" isMSIDir="true" visible="true" unlock="false"/> + <installDir name="FXAnalyse" dirID="101" parentID="2" isMSIDir="false" visible="true" unlock="false"/> + <installDir name="[Start>>Programs]" dirID="7" parentID="-1" isMSIDir="true" visible="true" unlock="false"/></dirs> <files> - <simpleFile fileID="0" 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="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\muparser.dll" 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\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"/></files> + <simpleFile fileID="0" sourcePath="\\syrte2\pub_lptf\nicolodi\FXAnalyse\FXAnalyse.ini" targetDir="101" readonly="false" hidden="false" system="false" regActiveX="false" runAfterInstallStyle="IMMEDIATELY_RESUME_INSTALL" cmdLineArgs="" runAfterInstall="false" uninstCmdLnArgs="" runUninst="false"/> + <simpleFile fileID="1" sourcePath="\\syrte2\pub_lptf\nicolodi\FXAnalyse\KK_FX80E.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="\\syrte2\pub_lptf\nicolodi\FXAnalyse\FXAllan.uir" 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\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"/> + <simpleFile fileID="4" 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="5" 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="6" sourcePath="\\syrte2\pub_lptf\nicolodi\FXAnalyse\FXPlot.uir" 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"> - <fileID>1</fileID></projectOutput> - <projectDependencies dirID="100" projectID="0"> - <fileID>2</fileID></projectDependencies></fileGroups> + <projectOutput targetType="0" dirID="101" projectID="0"> + <fileID>3</fileID></projectOutput> + <projectDependencies dirID="101" projectID="0"> + <fileID>5</fileID></projectDependencies></fileGroups> <shortcuts> - <shortcut name="FXAnalyse" targetFileID="1" destDirID="101" cmdLineArgs="" description="" runStyle="NORMAL"/></shortcuts> + <shortcut name="FXAnalyse" targetFileID="3" 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"/> + <runtimeEngine cvirte="true" instrsup="false" lvrt="false" analysis="true" netvarsup="false" dotnetsup="false" activeXsup="false" lowlevelsup="false" rtutilsup="false" installToAppDir="false"/> <advanced mediaSize="650"> <launchConditions> <condition>MINOS_WINXP</condition> @@ -47,14 +49,14 @@ <signDescURL></signDescURL></advanced> <Projects NumProjects="1"> <Project000 ProjectID="0" ProjectAbsolutePath="p:\nicolodi\FXAnalyse\FXAnalyse.prj" ProjectRelativePath="FXAnalyse.prj"/></Projects> - <buildData progressBarRate="2.319445708775157"> + <buildData progressBarRate="2.115520506005487"> <progressTimes> <Begin>0.000000000000000</Begin> - <ProductsAdded>0.642208642045056</ProductsAdded> - <DPConfigured>2.530415466378565</DPConfigured> - <DPMergeModulesAdded>21.480267661864449</DPMergeModulesAdded> - <DPClosed>30.115453477710012</DPClosed> - <DistributionsCopied>30.422384465335913</DistributionsCopied> - <End>43.113748953756527</End></progressTimes></buildData> + <ProductsAdded>0.223289528406390</ProductsAdded> + <DPConfigured>3.157049434943530</DPConfigured> + <DPMergeModulesAdded>23.906855576883675</DPMergeModulesAdded> + <DPClosed>33.247287854865746</DPClosed> + <DistributionsCopied>33.571589987571230</DistributionsCopied> + <End>47.269690705489509</End></progressTimes></buildData> </msi> </distribution>
--- a/FXAnalyse.prj Fri Feb 14 16:58:19 2014 +0100 +++ b/FXAnalyse.prj Fri Feb 14 16:58:22 2014 +0100 @@ -11,7 +11,7 @@ VXIplug&play Framework Dir = "/C/Program Files/IVI Foundation/VISA/winnt" IVI Standard Root 64-bit Dir = "/C/Program Files/IVI Foundation/IVI" VXIplug&play Framework 64-bit Dir = "/C/Program Files/IVI Foundation/VISA/win64" -Number of Files = 32 +Number of Files = 25 Target Type = "Executable" Flags = 16 Copied From Locked InstrDrv Directory = False @@ -22,31 +22,18 @@ [File 0001] File Type = "CSource" Res Id = 1 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "Allan.c" -Path = "/p/nicolodi/FXAnalyse/Allan.c" +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/Allan.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0002] -File Type = "Include" +File Type = "CSource" Res Id = 2 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "Allan.h" -Path = "/p/nicolodi/FXAnalyse/Allan.h" -Exclude = False -Project Flags = 0 -Folder = "Include Files" - -[File 0003] -File Type = "CSource" -Res Id = 3 -Path Is Rel = True -Path Rel To = "Project" Path Rel Path = "data-provider.c" Path = "/p/nicolodi/FXAnalyse/data-provider.c" Exclude = False @@ -54,80 +41,52 @@ Project Flags = 0 Folder = "Source Files" +[File 0003] +File Type = "Include" +Res Id = 3 +Path Is Rel = True +Path Rel To = "Project" +Path Rel Path = "data-provider.h" +Path = "/p/nicolodi/FXAnalyse/data-provider.h" +Exclude = False +Project Flags = 0 +Folder = "Include Files" + [File 0004] File Type = "CSource" Res Id = 4 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "DDS4xAD9912.c" -Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.c" +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/DDS4xAD9912.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0005] -File Type = "Include" +File Type = "CSource" Res Id = 5 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "DDS4xAD9912.h" -Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.h" +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/DDS4xAD9959.c" Exclude = False +Compile Into Object File = False Project Flags = 0 -Folder = "Include Files" +Folder = "Source Files" [File 0006] File Type = "CSource" Res Id = 6 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "DDS_Fox.c" -Path = "/p/nicolodi/FXAnalyse/DDS_Fox.c" +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/DDS_Fox.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0007] -File Type = "Include" +File Type = "CSource" Res Id = 7 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "DDS_Fox.h" -Path = "/p/nicolodi/FXAnalyse/DDS_Fox.h" -Exclude = False -Project Flags = 0 -Folder = "Include Files" - -[File 0008] -File Type = "CSource" -Res Id = 8 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "DDSBes.c" -Path = "/p/nicolodi/FXAnalyse/DDSBes.c" -Exclude = False -Compile Into Object File = False -Project Flags = 0 -Folder = "Source Files" - -[File 0009] -File Type = "Include" -Res Id = 9 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "DDSBes.h" -Path = "/p/nicolodi/FXAnalyse/DDSBes.h" -Exclude = False -Project Flags = 0 -Folder = "Include Files" - -[File 0010] -File Type = "CSource" -Res Id = 10 -Path Is Rel = True -Path Rel To = "Project" Path Rel Path = "fake-data-provider.c" Path = "/p/nicolodi/FXAnalyse/fake-data-provider.c" Exclude = False @@ -135,9 +94,9 @@ Project Flags = 0 Folder = "Source Files" -[File 0011] +[File 0008] File Type = "CSource" -Res Id = 11 +Res Id = 8 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "file-data-provider.c" @@ -147,9 +106,9 @@ Project Flags = 0 Folder = "Source Files" -[File 0012] +[File 0009] File Type = "CSource" -Res Id = 12 +Res Id = 9 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "future.c" @@ -159,9 +118,9 @@ Project Flags = 0 Folder = "Source Files" -[File 0013] +[File 0010] File Type = "Include" -Res Id = 13 +Res Id = 10 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "future.h" @@ -170,35 +129,71 @@ Project Flags = 0 Folder = "Include Files" -[File 0014] -File Type = "Include" -Res Id = 14 +[File 0011] +File Type = "CSource" +Res Id = 11 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "FXAllan.h" -Path = "/p/nicolodi/FXAnalyse/FXAllan.h" +Path Rel Path = "FXAnalyse.c" +Path = "/p/nicolodi/FXAnalyse/FXAnalyse.c" +Exclude = False +Compile Into Object File = False +Project Flags = 0 +Folder = "Source Files" + +[File 0012] +File Type = "Include" +Res Id = 12 +Path Is Rel = True +Path Rel To = "Project" +Path Rel Path = "FXAnalyse.h" +Path = "/p/nicolodi/FXAnalyse/FXAnalyse.h" Exclude = False Project Flags = 0 Folder = "Include Files" +[File 0013] +File Type = "User Interface Resource" +Res Id = 13 +Path Is Rel = True +Path Rel To = "Project" +Path Rel Path = "FXAnalyse.uir" +Path = "/p/nicolodi/FXAnalyse/FXAnalyse.uir" +Exclude = False +Project Flags = 0 +Folder = "User Interface Files" + +[File 0014] +File Type = "Function Panel" +Res Id = 14 +Path Is Rel = True +Path Rel To = "CVI" +Path Rel To Override = "CVI" +Path Rel Path = "toolslib/toolbox/inifile.fp" +Path = "/c/program files/national instruments/cvi2010/toolslib/toolbox/inifile.fp" +Exclude = False +Project Flags = 0 +Folder = "Instrument Files" + [File 0015] -File Type = "User Interface Resource" +File Type = "CSource" Res Id = 15 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "FXAllan.uir" -Path = "/p/nicolodi/FXAnalyse/FXAllan.uir" +Path Rel Path = "kk-data-provider.c" +Path = "/p/nicolodi/FXAnalyse/kk-data-provider.c" Exclude = False +Compile Into Object File = False Project Flags = 0 -Folder = "User Interface Files" +Folder = "Source Files" [File 0016] File Type = "CSource" Res Id = 16 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "FXAnalyse.c" -Path = "/p/nicolodi/FXAnalyse/FXAnalyse.c" +Path Rel Path = "KKFX80E.c" +Path = "/p/nicolodi/FXAnalyse/KKFX80E.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -209,105 +204,36 @@ Res Id = 17 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "FXAnalyse.h" -Path = "/p/nicolodi/FXAnalyse/FXAnalyse.h" -Exclude = False -Project Flags = 0 -Folder = "Include Files" - -[File 0018] -File Type = "User Interface Resource" -Res Id = 18 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "FXAnalyse.uir" -Path = "/p/nicolodi/FXAnalyse/FXAnalyse.uir" -Exclude = False -Project Flags = 0 -Folder = "User Interface Files" - -[File 0019] -File Type = "Include" -Res Id = 19 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "FXPlot.h" -Path = "/p/nicolodi/FXAnalyse/FXPlot.h" -Exclude = False -Project Flags = 0 -Folder = "Include Files" - -[File 0020] -File Type = "User Interface Resource" -Res Id = 20 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "FXPlot.uir" -Path = "/p/nicolodi/FXAnalyse/FXPlot.uir" -Exclude = False -Project Flags = 0 -Folder = "User Interface Files" - -[File 0021] -File Type = "CSource" -Res Id = 21 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "kk-data-provider.c" -Path = "/p/nicolodi/FXAnalyse/kk-data-provider.c" -Exclude = False -Compile Into Object File = False -Project Flags = 0 -Folder = "Source Files" - -[File 0022] -File Type = "DLL" -Res Id = 22 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "KK_FX80E.dll" -Path = "/p/nicolodi/FXAnalyse/KK_FX80E.dll" -Exclude = False -Project Flags = 0 -Folder = "Librairy Files" - -[File 0023] -File Type = "CSource" -Res Id = 23 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "KKFX80E.c" -Path = "/p/nicolodi/FXAnalyse/KKFX80E.c" -Exclude = False -Compile Into Object File = False -Project Flags = 0 -Folder = "Source Files" - -[File 0024] -File Type = "Include" -Res Id = 24 -Path Is Rel = True -Path Rel To = "Project" Path Rel Path = "KKFX80E.h" Path = "/p/nicolodi/FXAnalyse/KKFX80E.h" Exclude = False Project Flags = 0 Folder = "Include Files" -[File 0025] -File Type = "Library" -Res Id = 25 +[File 0018] +File Type = "CSource" +Res Id = 18 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "muParser.lib" -Path = "/p/nicolodi/FXAnalyse/muParser.lib" +Path Rel Path = "logging.c" +Path = "/p/nicolodi/FXAnalyse/logging.c" +Exclude = False +Compile Into Object File = False +Project Flags = 0 +Folder = "Source Files" + +[File 0019] +File Type = "Library" +Res Id = 19 +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/muParser.lib" Exclude = False Project Flags = 0 Folder = "Librairy Files" -[File 0026] +[File 0020] File Type = "Include" -Res Id = 26 +Res Id = 20 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "muParserDLL.h" @@ -316,55 +242,41 @@ Project Flags = 0 Folder = "Include Files" -[File 0027] +[File 0021] File Type = "CSource" -Res Id = 27 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "Plot.c" -Path = "/p/nicolodi/FXAnalyse/Plot.c" +Res Id = 21 +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/Plot.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" -[File 0028] -File Type = "Include" -Res Id = 28 +[File 0022] +File Type = "CSource" +Res Id = 22 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "Plot.h" -Path = "/p/nicolodi/FXAnalyse/Plot.h" -Exclude = False -Project Flags = 0 -Folder = "Include Files" - -[File 0029] -File Type = "CSource" -Res Id = 29 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "stat.c" -Path = "/p/nicolodi/FXAnalyse/stat.c" +Path Rel Path = "sr-data-logger.c" +Path = "/p/nicolodi/FXAnalyse/sr-data-logger.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" -[File 0030] -File Type = "Include" -Res Id = 30 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "stat.h" -Path = "/p/nicolodi/FXAnalyse/stat.h" +[File 0023] +File Type = "CSource" +Res Id = 23 +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/stat.c" Exclude = False +Compile Into Object File = False Project Flags = 0 -Folder = "Include Files" +Folder = "Source Files" -[File 0031] +[File 0024] File Type = "CSource" -Res Id = 31 +Res Id = 24 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "utils.c" @@ -374,9 +286,9 @@ Project Flags = 0 Folder = "Source Files" -[File 0032] +[File 0025] File Type = "Include" -Res Id = 32 +Res Id = 25 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "utils.h" @@ -386,11 +298,11 @@ Folder = "Include Files" [Folders] -Instrument Files Folder Not Added Yet = True Folder 0 = "Source Files" Folder 1 = "Include Files" Folder 2 = "User Interface Files" Folder 3 = "Librairy Files" +Folder 4 = "Instrument Files" [Custom Build Configs] Num Custom Build Configs = 0