Mercurial > hg > fxanalyse
changeset 19:e9d8791502c0
New build
author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
---|---|
date | Wed, 18 Jul 2012 18:53:32 +0200 |
parents | 721d817f171e |
children | 3a7f088d4960 |
files | FXAnalyse.cdb FXAnalyse.cds FXAnalyse.cws |
diffstat | 3 files changed, 74 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/FXAnalyse.cds Wed Jul 18 18:50:04 2012 +0200 +++ b/FXAnalyse.cds Wed Jul 18 18:53:32 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.5"> + <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.12"> <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"/> @@ -34,7 +34,7 @@ <runtimeEngine cvirte="true" instrsup="false" lvrt="false" analysis="false" netvarsup="false" dotnetsup="false" activeXsup="false" lowlevelsup="false" rtutilsup="false" installToAppDir="false"/> <advanced mediaSize="650"> <launchConditions> - <condition>MINOS_WIN2K_SP3</condition> + <condition>MINOS_WINXP</condition> </launchConditions> <includeConfigProducts>true</includeConfigProducts> <maxImportVisible>silent</maxImportVisible> @@ -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.104281851640971"> + <buildData progressBarRate="3.199045502580353"> <progressTimes> <Begin>0.000000000000000</Begin> - <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> + <ProductsAdded>0.297250735595860</ProductsAdded> + <DPConfigured>3.412774835815581</DPConfigured> + <DPMergeModulesAdded>15.219883811035109</DPMergeModulesAdded> + <DPClosed>20.572382428955084</DPClosed> + <DistributionsCopied>20.893255114624157</DistributionsCopied> + <End>31.259324045044028</End></progressTimes></buildData> </msi> </distribution>
--- a/FXAnalyse.cws Wed Jul 18 18:50:04 2012 +0200 +++ b/FXAnalyse.cws Wed Jul 18 18:53:32 2012 +0200 @@ -14,10 +14,10 @@ Active Project = 1 Project 0001 = "FXAnalyse.prj" Drag Bar Left = 335 -Window Top = 22 -Window Left = 24 -Window Bottom = 870 -Window Right = 1609 +Window Top = 34 +Window Left = 62 +Window Bottom = 882 +Window Right = 1647 Maximized = False Maximized Children = True Max32 Number Of Errors = 20 @@ -30,7 +30,7 @@ Hide Windows = False Break At First Statement = False Sort Type = "File Name" -Number of Opened Files = 5 +Number of Opened Files = 10 Window Confinement Region Enabled = True MainColumnWidth = 318 FileDateColumnWidth = 70 @@ -41,7 +41,7 @@ Version = 910 Don't Update DistKit = False Platform Code = 4 -Build Configuration = "Release" +Build Configuration = "Debug" Build Platform = "Intel 32-bit" Warn User If Debugging Release = 1 Batch Build Release = False @@ -51,33 +51,33 @@ [File 0001] Path = "/p/nicolodi/FXAnalyse/FXAnalyse.c" File Type = "CSource" -Disk Date = 3425282100 +Disk Date = 3425473452 In Projects = "1," Window Top = 32 Window Left = 6 Window Z-Order = 1 -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," +Source Window State = "1,2924,2924,2924,62,68,62,0,0,173,0,2901,0,0,0,41,381,0,401,8,349,671,1,13," [File 0002] Path = "/p/nicolodi/FXAnalyse/FXAnalyse.h" File Type = "Include" -Disk Date = 3425014333 +Disk Date = 3425472737 In Projects = "1," Window Top = 32 Window Left = 6 -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," +Window Z-Order = 3 +Source Window State = "1,26,26,26,9,24,24,0,3,92,0,0,0,0,0,23,9,0,26,9,349,683,1,0," [File 0003] Path = "/p/nicolodi/FXAnalyse/FXAnalyse.uir" File Type = "User Interface Resource" -Disk Date = 3425014333 +Disk Date = 3425472737 In Projects = "1," Window Top = 92 Window Left = 38 Window Height = 349 Window Width = 683 -Window Z-Order = 4 +Window Z-Order = 2 [File 0004] Path = "/p/nicolodi/FXAnalyse/DDS_Fox.c" @@ -86,30 +86,36 @@ 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," +Window Z-Order = 10 +Source Window State = "1,298,298,298,8,14,14,1,0,90,0,0,0,0,0,23,25,0,45,20,349,671,1,0," [File 0005] +Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.c" +File Type = "CSource" +Disk Date = 3424165960 +In Projects = "1," +Window Top = 32 +Window Left = 6 +Window Z-Order = 6 +Source Window State = "1,0,0,0,0,0,0,0,0,77,0,0,0,0,0,25,151,0,176,11,375,580,1,0," + +[File 0006] 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," +Window Top = 122 +Window Left = 54 +Window Z-Order = 7 +Source Window State = "1,50,50,50,0,11,11,0,0,80,0,0,0,0,0,25,253,0,275,84,375,601,1,0," -[File 0006] +[File 0007] 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 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 0008] Path = "/p/nicolodi/FXAnalyse/DDS4xAD9912.h" File Type = "Include" @@ -129,10 +135,10 @@ File Type = "CSource" Disk Date = 3424165960 In Projects = "1," -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," +Window Top = 152 +Window Left = 70 +Window Z-Order = 5 +Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,143,0,147,29,375,601,1,0," [File 0011] Path = "/p/nicolodi/FXAnalyse/DDSBes.h" @@ -208,6 +214,36 @@ 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 0022] +Path = "/c/Program Files/National Instruments/CVI2009/include/userint.h" +File Type = "Include" +Disk Date = 3346736400 +In Projects = "" +Window Top = 92 +Window Left = 38 +Window Z-Order = 4 +Source Window State = "1,2067,2067,2067,61,80,61,0,0,80,0,0,0,0,0,25,2050,0,2065,51,375,601,1,0," + +[File 0023] +Path = "/p/nicolodi/FXAnalyse/future.c" +File Type = "CSource" +Disk Date = 3425459345 +In Projects = "1," +Window Top = 62 +Window Left = 22 +Window Z-Order = 9 +Source Window State = "1,3,3,3,0,22,0,0,3,80,0,1,0,1,0,25,0,0,3,22,375,601,1,0," + +[File 0024] +Path = "/p/nicolodi/FXAnalyse/future.h" +File Type = "Include" +Disk Date = 3425459276 +In Projects = "1," +Window Top = 92 +Window Left = 38 +Window Z-Order = 8 +Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,375,601,1,0," + [Build Options 0001] Generate Browse Info = True Enable Uninitialized Locals Runtime Warning = True