Mercurial > hg > fxanalyse
changeset 189:e6cb16365d12
New build
| author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
|---|---|
| date | Mon, 31 Mar 2014 17:03:31 +0200 |
| parents | 6e64ac00303e |
| children | c03bf6fe8297 |
| files | FXAnalyse.cdb FXAnalyse.cds FXAnalyse.prj |
| diffstat | 3 files changed, 44 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/FXAnalyse.cds Mon Feb 24 15:18:07 2014 +0100 +++ b/FXAnalyse.cds Mon Mar 31 17:03:31 2014 +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.4.34"> + <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.41"> <arp company="" companyURL="" supportURL="" contact="" phone="" comments=""/> <summary title="" subject="" keyWords="" comments="" author=""/></general> <userinterface language="English" showPaths="true" readMe="" license=""> @@ -49,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.115520506005487"> + <buildData progressBarRate="2.556061694416197"> <progressTimes> <Begin>0.000000000000000</Begin> - <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> + <ProductsAdded>0.389358136941846</ProductsAdded> + <DPConfigured>2.802268081509614</DPConfigured> + <DPMergeModulesAdded>20.879220809184318</DPMergeModulesAdded> + <DPClosed>28.034223576989703</DPClosed> + <DistributionsCopied>28.291442953045330</DistributionsCopied> + <End>39.122686364907928</End></progressTimes></buildData> </msi> </distribution>
--- a/FXAnalyse.prj Mon Feb 24 15:18:07 2014 +0100 +++ b/FXAnalyse.prj Mon Mar 31 17:03:31 2014 +0200 @@ -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 = 25 +Number of Files = 26 Target Type = "Executable" Flags = 16 Copied From Locked InstrDrv Directory = False @@ -66,21 +66,20 @@ File Type = "CSource" Res Id = 5 Path Is Rel = False -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/DDS4xAD9959.c" +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/DDS_Fox.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0006] -File Type = "CSource" +File Type = "Include" Res Id = 6 Path Is Rel = False -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/DDS_Fox.c" +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/DDS_Fox.h" Exclude = False -Compile Into Object File = False Project Flags = 0 -Folder = "Source Files" +Folder = "Include Files" [File 0007] File Type = "CSource" @@ -213,27 +212,36 @@ [File 0018] File Type = "CSource" Res Id = 18 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "logging.c" -Path = "/p/nicolodi/FXAnalyse/logging.c" +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/logging.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0019] +File Type = "Include" +Res Id = 19 +Path Is Rel = True +Path Rel To = "Project" +Path Rel Path = "logging.h" +Path = "/p/nicolodi/FXAnalyse/logging.h" +Exclude = False +Project Flags = 0 +Folder = "Include Files" + +[File 0020] File Type = "Library" -Res Id = 19 +Res Id = 20 Path Is Rel = False Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/muParser.lib" Exclude = False Project Flags = 0 Folder = "Librairy Files" -[File 0020] +[File 0021] File Type = "Include" -Res Id = 20 +Res Id = 21 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "muParserDLL.h" @@ -242,23 +250,11 @@ Project Flags = 0 Folder = "Include Files" -[File 0021] -File Type = "CSource" -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 0022] File Type = "CSource" Res Id = 22 -Path Is Rel = True -Path Rel To = "Project" -Path Rel Path = "sr-data-logger.c" -Path = "/p/nicolodi/FXAnalyse/sr-data-logger.c" +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/Plot.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -268,7 +264,7 @@ File Type = "CSource" Res Id = 23 Path Is Rel = False -Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/stat.c" +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/sr-data-logger.c" Exclude = False Compile Into Object File = False Project Flags = 0 @@ -277,6 +273,16 @@ [File 0024] File Type = "CSource" Res Id = 24 +Path Is Rel = False +Path = "//syrte2/pub_lptf/nicolodi/FXAnalyse/stat.c" +Exclude = False +Compile Into Object File = False +Project Flags = 0 +Folder = "Source Files" + +[File 0025] +File Type = "CSource" +Res Id = 25 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "utils.c" @@ -286,9 +292,9 @@ Project Flags = 0 Folder = "Source Files" -[File 0025] +[File 0026] File Type = "Include" -Res Id = 25 +Res Id = 26 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "utils.h"