changeset 106:c1a3b6ef94fe

New build
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Mon, 08 Apr 2013 18:11:12 +0200
parents 29b1aa89a34c
children 6fd67aa13d10
files FXAnalyse.cdb FXAnalyse.cds FXAnalyse.prj
diffstat 3 files changed, 32 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
Binary file FXAnalyse.cdb has changed
--- a/FXAnalyse.cds	Mon Apr 08 18:08:37 2013 +0200
+++ b/FXAnalyse.cds	Mon Apr 08 18:11:12 2013 +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.3.6">
+		<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.3.8">
 			<arp company="" companyURL="" supportURL="" contact="" phone="" comments=""/>
 			<summary title="" subject="" keyWords="" comments="" author=""/></general>
 		<userinterface language="English" showPaths="true" readMe="" license="">
@@ -21,7 +21,7 @@
 			<simpleFile fileID="1" 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="2" 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="3" 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="4" 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"/></files>
+			<simpleFile fileID="4" 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"/></files>
 		<fileGroups>
 			<projectOutput targetType="0" dirID="100" projectID="0">
 				<fileID>3</fileID></projectOutput>
@@ -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.148921212107190">
+		<buildData progressBarRate="3.160852747469741">
 			<progressTimes>
 				<Begin>0.000000000000000</Begin>
-				<ProductsAdded>0.333269711883258</ProductsAdded>
-				<DPConfigured>1.891860455349698</DPConfigured>
-				<DPMergeModulesAdded>17.011209042246765</DPMergeModulesAdded>
-				<DPClosed>21.608628773274489</DPClosed>
-				<DistributionsCopied>21.936408590979450</DistributionsCopied>
-				<End>31.756907608711543</End></progressTimes></buildData>
+				<ProductsAdded>0.129767427970815</ProductsAdded>
+				<DPConfigured>2.256915613837424</DPConfigured>
+				<DPMergeModulesAdded>17.411755510561690</DPMergeModulesAdded>
+				<DPClosed>22.186104443318623</DPClosed>
+				<DistributionsCopied>22.505550647744862</DistributionsCopied>
+				<End>31.637032152177884</End></progressTimes></buildData>
 	</msi>
 </distribution>
--- a/FXAnalyse.prj	Mon Apr 08 18:08:37 2013 +0200
+++ b/FXAnalyse.prj	Mon Apr 08 18:11:12 2013 +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 = 28
+Number of Files = 29
 Target Type = "Executable"
 Flags = 16
 Copied From Locked InstrDrv Directory = False
@@ -272,8 +272,19 @@
 Folder = "Source Files"
 
 [File 0023]
+File Type = "Include"
+Res Id = 23
+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 0024]
 File Type = "Library"
-Res Id = 23
+Res Id = 24
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "muParser.lib"
@@ -282,9 +293,9 @@
 Project Flags = 0
 Folder = "Librairy Files"
 
-[File 0024]
+[File 0025]
 File Type = "Include"
-Res Id = 24
+Res Id = 25
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "muParserDLL.h"
@@ -293,9 +304,9 @@
 Project Flags = 0
 Folder = "Include Files"
 
-[File 0025]
+[File 0026]
 File Type = "CSource"
-Res Id = 25
+Res Id = 26
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "Plot.c"
@@ -305,9 +316,9 @@
 Project Flags = 0
 Folder = "Source Files"
 
-[File 0026]
+[File 0027]
 File Type = "Include"
-Res Id = 26
+Res Id = 27
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "Plot.h"
@@ -316,9 +327,9 @@
 Project Flags = 0
 Folder = "Include Files"
 
-[File 0027]
+[File 0028]
 File Type = "CSource"
-Res Id = 27
+Res Id = 28
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "YLCStuff.c"
@@ -328,9 +339,9 @@
 Project Flags = 0
 Folder = "Source Files"
 
-[File 0028]
+[File 0029]
 File Type = "Include"
-Res Id = 28
+Res Id = 29
 Path Is Rel = True
 Path Rel To = "Project"
 Path Rel Path = "YLCStuff.h"