Mercurial > hg > fxanalyse
changeset 212:3d63702b33c1
New build
author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
---|---|
date | Mon, 31 Mar 2014 17:03:43 +0200 |
parents | f61fcffb4b93 |
children | fcc988c6f841 |
files | FXAnalyse.cdb FXAnalyse.cds FXAnalyse.prj |
diffstat | 3 files changed, 155 insertions(+), 114 deletions(-) [+] |
line wrap: on
line diff
--- a/FXAnalyse.cds Mon Mar 31 17:03:39 2014 +0200 +++ b/FXAnalyse.cds Mon Mar 31 17:03:43 2014 +0200 @@ -6,7 +6,7 @@ <workingdir>workspacedir</workingdir> <actions></actions></postbuild> <msi GUID="{B33DEF13-BB3E-4080-AE98-C5CCC94A66DC}"> - <general appName="FXAnalyse" outputLocation="\\syrte2\pub_lptf\nicolodi\FXAnalyse\cvidistkit.FXAnalyse" relOutputLocation="cvidistkit.FXAnalyse" outputLocationWithVars="\\syrte2\pub_lptf\nicolodi\FXAnalyse\cvidistkit.%name" relOutputLocationWithVars="cvidistkit.%name" upgradeBehavior="1" autoIncrement="true" version="7.4.55"> + <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.61"> <arp company="" companyURL="" supportURL="" contact="" phone="" comments=""/> <summary title="" subject="" keyWords="" comments="" author=""/></general> <userinterface language="English" showPaths="true" readMe="" license=""> @@ -19,15 +19,17 @@ <files> <simpleFile fileID="0" sourcePath="\\syrte2\pub_lptf\nicolodi\FXAnalyse\KK_FX80E.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="\\syrte2\pub_lptf\nicolodi\FXAnalyse\FXAllan.uir" targetDir="100" 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\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\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="3" sourcePath="\\syrte2\pub_lptf\nicolodi\FXAnalyse\FXPlot.uir" targetDir="100" readonly="false" hidden="false" system="false" regActiveX="false" runAfterInstallStyle="IMMEDIATELY_RESUME_INSTALL" cmdLineArgs="" runAfterInstall="false" uninstCmdLnArgs="" runUninst="false"/> - <simpleFile fileID="4" sourcePath="\\syrte2\pub_lptf\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="5" sourcePath="\\syrte2\pub_lptf\nicolodi\FXAnalyse\muparser.dll" targetDir="100" readonly="false" hidden="false" system="false" regActiveX="false" runAfterInstallStyle="IMMEDIATELY_RESUME_INSTALL" cmdLineArgs="" runAfterInstall="false" uninstCmdLnArgs="" runUninst="false"/></files> + <simpleFile fileID="4" 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="5" 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="6" sourcePath="C:\WINDOWS\system32\WS2_32.dll" 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>2</fileID></projectOutput> <projectDependencies dirID="100" projectID="0"> - <fileID>5</fileID></projectDependencies></fileGroups> + <fileID>5</fileID> + <fileID>6</fileID></projectDependencies></fileGroups> <shortcuts> <shortcut name="FXAnalyse" targetFileID="2" destDirID="101" cmdLineArgs="" description="" runStyle="NORMAL"/></shortcuts> <mergemodules/> @@ -47,15 +49,15 @@ <signTimeURL></signTimeURL> <signDescURL></signDescURL></advanced> <Projects NumProjects="1"> - <Project000 ProjectID="0" ProjectAbsolutePath="\\syrte2\pub_lptf\nicolodi\FXAnalyse\FXAnalyse.prj" ProjectRelativePath="FXAnalyse.prj"/></Projects> - <buildData progressBarRate="2.425840499984171"> + <Project000 ProjectID="0" ProjectAbsolutePath="p:\nicolodi\FXAnalyse\FXAnalyse.prj" ProjectRelativePath="FXAnalyse.prj"/></Projects> + <buildData progressBarRate="2.519061184291300"> <progressTimes> <Begin>0.000000000000000</Begin> - <ProductsAdded>0.588476055810206</ProductsAdded> - <DPConfigured>4.171855316986498</DPConfigured> - <DPMergeModulesAdded>22.772987204244291</DPMergeModulesAdded> - <DPClosed>30.263862712612095</DPClosed> - <DistributionsCopied>30.552303186160785</DistributionsCopied> - <End>41.222825655954097</End></progressTimes></buildData> + <ProductsAdded>0.335340953998026</ProductsAdded> + <DPConfigured>3.686714911203346</DPConfigured> + <DPMergeModulesAdded>21.556250987566415</DPMergeModulesAdded> + <DPClosed>28.738929386135318</DPClosed> + <DistributionsCopied>29.002822659161005</DistributionsCopied> + <End>39.697328760251409</End></progressTimes></buildData> </msi> </distribution>
--- a/FXAnalyse.prj Mon Mar 31 17:03:39 2014 +0200 +++ b/FXAnalyse.prj Mon Mar 31 17:03:43 2014 +0200 @@ -1,6 +1,6 @@ [Project Header] Version = 1001 -Pathname = "//syrte2/pub_lptf/nicolodi/FXAnalyse/FXAnalyse.prj" +Pathname = "/p/nicolodi/FXAnalyse/FXAnalyse.prj" Project Label = "FXAnalyse" CVI Dir = "/c/program files/national instruments/cvi2010" CVI Shared Dir = "/C/Program Files/National Instruments/Shared/CVI" @@ -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 = 27 +Number of Files = 30 Target Type = "Executable" Flags = 16 Copied From Locked InstrDrv Directory = False @@ -22,7 +22,9 @@ [File 0001] File Type = "CSource" Res Id = 1 -Path Is Rel = False +Path Is Rel = True +Path Rel To = "Project" +Path Rel Path = "ad9912.c" Path = "/p/nicolodi/FXAnalyse/ad9912.c" Exclude = False Compile Into Object File = False @@ -32,7 +34,9 @@ [File 0002] File Type = "Include" Res Id = 2 -Path Is Rel = False +Path Is Rel = True +Path Rel To = "Project" +Path Rel Path = "ad9912.h" Path = "/p/nicolodi/FXAnalyse/ad9912.h" Exclude = False Project Flags = 0 @@ -43,43 +47,43 @@ Res Id = 3 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "Allan.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/Allan.c" +Path Rel Path = "ad9956.c" +Path = "/p/nicolodi/FXAnalyse/ad9956.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0004] -File Type = "CSource" +File Type = "Include" Res Id = 4 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "data-provider.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/data-provider.c" +Path Rel Path = "ad9956.h" +Path = "/p/nicolodi/FXAnalyse/ad9956.h" +Exclude = False +Project Flags = 0 +Folder = "Include Files" + +[File 0005] +File Type = "CSource" +Res Id = 5 +Path Is Rel = True +Path Rel To = "Project" +Path Rel Path = "Allan.c" +Path = "/p/nicolodi/FXAnalyse/Allan.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" -[File 0005] -File Type = "Include" -Res Id = 5 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "data-provider.h" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/data-provider.h" -Exclude = False -Project Flags = 0 -Folder = "Include Files" - [File 0006] File Type = "CSource" Res Id = 6 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "DDS_Fox.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/DDS_Fox.c" +Path Rel Path = "data-provider.c" +Path = "/p/nicolodi/FXAnalyse/data-provider.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -90,8 +94,8 @@ Res Id = 7 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "DDS_Fox.h" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/DDS_Fox.h" +Path Rel Path = "data-provider.h" +Path = "/p/nicolodi/FXAnalyse/data-provider.h" Exclude = False Project Flags = 0 Folder = "Include Files" @@ -101,55 +105,55 @@ Res Id = 8 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "fake-data-provider.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/fake-data-provider.c" +Path Rel Path = "dds.c" +Path = "/p/nicolodi/FXAnalyse/dds.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0009] -File Type = "CSource" +File Type = "Include" Res Id = 9 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "file-data-provider.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/file-data-provider.c" +Path Rel Path = "dds.h" +Path = "/p/nicolodi/FXAnalyse/dds.h" Exclude = False -Compile Into Object File = False Project Flags = 0 -Folder = "Source Files" +Folder = "Include Files" [File 0010] File Type = "CSource" Res Id = 10 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "future.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/future.c" +Path Rel Path = "fake-data-provider.c" +Path = "/p/nicolodi/FXAnalyse/fake-data-provider.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0011] -File Type = "Include" +File Type = "CSource" Res Id = 11 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "future.h" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/future.h" +Path Rel Path = "file-data-provider.c" +Path = "/p/nicolodi/FXAnalyse/file-data-provider.c" Exclude = False +Compile Into Object File = False Project Flags = 0 -Folder = "Include Files" +Folder = "Source Files" [File 0012] File Type = "CSource" Res Id = 12 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "FXAnalyse.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/FXAnalyse.c" +Path Rel Path = "future.c" +Path = "/p/nicolodi/FXAnalyse/future.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -160,26 +164,49 @@ Res Id = 13 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "FXAnalyse.h" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/FXAnalyse.h" +Path Rel Path = "future.h" +Path = "/p/nicolodi/FXAnalyse/future.h" Exclude = False Project Flags = 0 Folder = "Include Files" [File 0014] -File Type = "User Interface Resource" +File Type = "CSource" Res Id = 14 Path Is Rel = True Path Rel To = "Project" +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 0015] +File Type = "Include" +Res Id = 15 +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 0016] +File Type = "User Interface Resource" +Res Id = 16 +Path Is Rel = True +Path Rel To = "Project" Path Rel Path = "FXAnalyse.uir" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/FXAnalyse.uir" +Path = "/p/nicolodi/FXAnalyse/FXAnalyse.uir" Exclude = False Project Flags = 0 Folder = "User Interface Files" -[File 0015] +[File 0017] File Type = "Function Panel" -Res Id = 15 +Res Id = 17 Path Is Rel = True Path Rel To = "CVI" Path Rel To Override = "CVI" @@ -189,48 +216,25 @@ Project Flags = 0 Folder = "Instrument Files" -[File 0016] +[File 0018] File Type = "CSource" -Res Id = 16 +Res Id = 18 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "kk-data-provider.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/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 0017] -File Type = "CSource" -Res Id = 17 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "KKFX80E.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/KKFX80E.c" -Exclude = False -Compile Into Object File = False -Project Flags = 0 -Folder = "Source Files" - -[File 0018] -File Type = "Include" -Res Id = 18 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "KKFX80E.h" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/KKFX80E.h" -Exclude = False -Project Flags = 0 -Folder = "Include Files" - [File 0019] File Type = "CSource" Res Id = 19 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "logging.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/logging.c" +Path Rel Path = "KKFX80E.c" +Path = "/p/nicolodi/FXAnalyse/KKFX80E.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -241,65 +245,64 @@ Res Id = 20 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "logging.h" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/logging.h" +Path Rel Path = "KKFX80E.h" +Path = "/p/nicolodi/FXAnalyse/KKFX80E.h" Exclude = False Project Flags = 0 Folder = "Include Files" [File 0021] -File Type = "Library" +File Type = "CSource" Res Id = 21 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "muParser.lib" -Path = "//syrte2/pub_lptf/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 = "Librairy Files" +Folder = "Source Files" [File 0022] File Type = "Include" Res Id = 22 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "muParserDLL.h" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/muParserDLL.h" +Path Rel Path = "logging.h" +Path = "/p/nicolodi/FXAnalyse/logging.h" Exclude = False Project Flags = 0 Folder = "Include Files" [File 0023] -File Type = "CSource" +File Type = "Library" Res Id = 23 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "Plot.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/Plot.c" +Path Rel Path = "muParser.lib" +Path = "/p/nicolodi/FXAnalyse/muParser.lib" Exclude = False -Compile Into Object File = False Project Flags = 0 -Folder = "Source Files" +Folder = "Librairy Files" [File 0024] -File Type = "CSource" +File Type = "Include" Res Id = 24 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "sr-data-logger.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/sr-data-logger.c" +Path Rel Path = "muParserDLL.h" +Path = "/p/nicolodi/FXAnalyse/muParserDLL.h" Exclude = False -Compile Into Object File = False Project Flags = 0 -Folder = "Source Files" +Folder = "Include Files" [File 0025] File Type = "CSource" Res Id = 25 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "stat.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/stat.c" +Path Rel Path = "Plot.c" +Path = "/p/nicolodi/FXAnalyse/Plot.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -310,24 +313,60 @@ Res Id = 26 Path Is Rel = True Path Rel To = "Project" -Path Rel Path = "utils.c" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/utils.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 0027] +File Type = "CSource" +Res Id = 27 +Path Is Rel = True +Path Rel To = "Project" +Path Rel Path = "stat.c" +Path = "/p/nicolodi/FXAnalyse/stat.c" +Exclude = False +Compile Into Object File = False +Project Flags = 0 +Folder = "Source Files" + +[File 0028] +File Type = "CSource" +Res Id = 28 +Path Is Rel = True +Path Rel To = "Project" +Path Rel Path = "utils.c" +Path = "/p/nicolodi/FXAnalyse/utils.c" +Exclude = False +Compile Into Object File = False +Project Flags = 0 +Folder = "Source Files" + +[File 0029] File Type = "Include" -Res Id = 27 +Res Id = 29 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "utils.h" -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/utils.h" +Path = "/p/nicolodi/FXAnalyse/utils.h" Exclude = False Project Flags = 0 Folder = "Include Files" +[File 0030] +File Type = "Library" +Res Id = 30 +Path Is Rel = True +Path Rel To = "CVI" +Path Rel To Override = "CVI" +Path Rel Path = "sdk/lib/msvc/WS2_32.Lib" +Path = "/c/Program Files/National Instruments/CVI2010/sdk/lib/msvc/WS2_32.Lib" +Exclude = False +Project Flags = 0 +Folder = "Librairy Files" + [Folders] Folder 0 = "Source Files" Folder 1 = "Include Files" @@ -604,19 +643,19 @@ Executable File_Debug Is Rel = True Executable File_Debug Rel To = "Project" Executable File_Debug Rel Path = "FXAnalyse.exe" -Executable File_Debug = "//syrte2/pub_lptf/nicolodi/FXAnalyse/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 = "//syrte2/pub_lptf/nicolodi/FXAnalyse/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 = "//syrte2/pub_lptf/nicolodi/FXAnalyse/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 = "//syrte2/pub_lptf/nicolodi/FXAnalyse/FXAnalyse.exe" +Executable File_Release64 = "/p/nicolodi/FXAnalyse/FXAnalyse.exe" Icon File Is Rel = False Icon File = "" Application Title = ""