Menu
▾
▴
[NAntC-cvs] NAntContrib NAntContribInstall.include,1.14,1.15
|
From: <dri...@us...> - 2004-11-27 17:20:51
|
Update of /cvsroot/nantcontrib/NAntContrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13441 Modified Files: NAntContribInstall.include Log Message: fixed installer, fixed warnings Index: NAntContribInstall.include =================================================================== RCS file: /cvsroot/nantcontrib/NAntContrib/NAntContribInstall.include,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** NAntContribInstall.include 23 Oct 2004 09:07:06 -0000 1.14 --- NAntContribInstall.include 27 Nov 2004 17:20:22 -0000 1.15 *************** *** 10,22 **** <!--* Preparation for creating install packages *--> <!--*****************************************************************--> ! <target name="install.prepare" description="Preparation for creating install packages" depends="package"> <!-- Properties that the user *could* specify via the command-line --> ! <property name="nant.bin.dir" value="${nant.dir}/bin/" overwrite="false" /> ! <property name="nant.doc.dir" value="${nant.dir}/doc/" overwrite="false" /> ! <property name="nant.etc.dir" value="${nant.dir}/etc/" overwrite="false" /> ! <property name="nant.examples.dir" value="${nant.dir}/examples/" overwrite="false" /> ! <property name="nant.schema.dir" value="${nant.dir}/schema/" overwrite="false" /> ! <property name="nant.src.dir" value="${nant.dir}/src/" overwrite="false" /> ! <property name="nant.tests.dir" value="${nant.dir}/tests/" overwrite="false" /> <!-- NAnt specific properties --> --- 10,24 ---- <!--* Preparation for creating install packages *--> <!--*****************************************************************--> ! <target name="install.prepare" description="Preparation for creating install packages" depends="package"> ! <!-- load NAntContrib extensions --> ! <loadtasks assembly="${build.dir}/bin/NAnt.Contrib.Tasks.dll" /> <!-- Properties that the user *could* specify via the command-line --> ! <property name="nant.bin.dir" value="${nant.dir}/bin/" /> ! <property name="nant.doc.dir" value="${nant.dir}/doc/" /> ! <property name="nant.etc.dir" value="${nant.dir}/etc/" /> ! <property name="nant.examples.dir" value="${nant.dir}/examples/" /> ! <property name="nant.schema.dir" value="${nant.dir}/schema/" /> ! <property name="nant.src.dir" value="${nant.dir}/src/" /> ! <property name="nant.tests.dir" value="${nant.dir}/tests/" /> <!-- NAnt specific properties --> *************** *** 24,28 **** <property name="nant.bin.keyfile" value="NAnt.exe.config" /> ! <property name="nant.doc.keyfile" value="index.html" /> <property name="nant.doc.help.dir" value="${nant.doc.dir}/help/" /> <property name="nant.doc.help.keyfile" value="index.html" /> --- 26,30 ---- <property name="nant.bin.keyfile" value="NAnt.exe.config" /> ! <property name="nant.doc.keyfile" value="license.html" /> <property name="nant.doc.help.dir" value="${nant.doc.dir}/help/" /> <property name="nant.doc.help.keyfile" value="index.html" /> *************** *** 33,37 **** <property name="nant.examples.keyfile" value="examples.build" /> ! <property name="nant.schema.keyfile" value="nant-0.85.xsd" /> <property name="nant.src.keyfile" value="CommonAssemblyInfo.cs" /> <property name="nant.tests.keyfile" value="NAnt.Tests.csproj" /> --- 35,39 ---- <property name="nant.examples.keyfile" value="examples.build" /> ! <property name="nant.schema.keyfile" value="nant.xsd" /> <property name="nant.src.keyfile" value="CommonAssemblyInfo.cs" /> <property name="nant.tests.keyfile" value="NAnt.Tests.csproj" /> *************** *** 41,48 **** <property name="nantcontrib.keyfile" value="NAntContrib.build" /> <property name="nantcontrib.bin.dir" value="${nantcontrib.dir}/bin/" /> ! <property name="nantcontrib.bin.keyfile" value="NAnt.Contrib.Tasks.xml" /> <property name="nantcontrib.doc.dir" value="${nantcontrib.dir}/doc/" /> ! <property name="nantcontrib.doc.keyfile" value="index.html" /> <property name="nantcontrib.doc.help.dir" value="${nantcontrib.doc.dir}/help/" /> <property name="nantcontrib.doc.help.keyfile" value="index.html" /> --- 43,50 ---- <property name="nantcontrib.keyfile" value="NAntContrib.build" /> <property name="nantcontrib.bin.dir" value="${nantcontrib.dir}/bin/" /> ! <property name="nantcontrib.bin.keyfile" value="NAnt.Contrib.Tasks.dll" /> <property name="nantcontrib.doc.dir" value="${nantcontrib.dir}/doc/" /> ! <property name="nantcontrib.doc.keyfile" value="license.html" /> <property name="nantcontrib.doc.help.dir" value="${nantcontrib.doc.dir}/help/" /> <property name="nantcontrib.doc.help.keyfile" value="index.html" /> *************** *** 65,89 **** <script language="C#" prefix="script" > ! <code><![CDATA[ ! ! [Function("CreateRegistryGuid")] ! public string CreateRegistryGuid() { ! ! return "{"+Guid.NewGuid().ToString().ToUpper()+"}"; ! ! } ! ! [Function("CreateIdGuid")] ! public string CreateIdGuid() { ! ! return Guid.NewGuid().ToString().ToUpper().Replace("-",""); ! ! } ! ! ]]></code> </script> ! <property name="install.dir" value="${build.dir}/Install" /> ! <mkdir dir="${install.dir}" failonerror="false" /> <if test="${not directory::exists(nant.doc.help.dir)}"> --- 67,87 ---- <script language="C#" prefix="script" > ! <code> ! <![CDATA[ ! [Function("CreateRegistryGuid")] ! public string CreateRegistryGuid() { ! return "{"+Guid.NewGuid().ToString().ToUpper()+"}"; ! } ! ! [Function("CreateIdGuid")] ! public string CreateIdGuid() { ! return Guid.NewGuid().ToString().ToUpper().Replace("-",""); ! } ! ]]> ! </code> </script> ! <property name="install.dir" value="${build.dir}/Install" /> ! <mkdir dir="${install.dir}" /> <if test="${not directory::exists(nant.doc.help.dir)}"> *************** *** 135,156 **** <directory name="D__NANT_ETC" foldername="etc" /> --> ! </directory> </directories> ! <components> <component name="C__NAnt_Schema" id="{62F4F96C-E92B-420e-B6E5-E236C64A78AF}" attr="2" directory="D__NANT_SCHEMA" feature="F__Schema_NAnt"> <key file="${nant.schema.keyfile}" /> <fileset basedir="${nant.schema.dir}"> ! <include name="*.*" /> </fileset> </component> ! <!-- TODO <component name="C__NAnt_Etc" id="{32F1BC49-D390-4f70-8779-876CD5830C19}" attr="2" directory="D__NANT_ETC" feature="F__Etc_NAnt"> <key file="${nant.etc.keyfile}" /> <fileset basedir="${nant.etc.dir}"> ! <include name="*.*" /> </fileset> </component> ! --> </components> --- 133,154 ---- <directory name="D__NANT_ETC" foldername="etc" /> --> ! </directory> </directories> ! <components> <component name="C__NAnt_Schema" id="{62F4F96C-E92B-420e-B6E5-E236C64A78AF}" attr="2" directory="D__NANT_SCHEMA" feature="F__Schema_NAnt"> <key file="${nant.schema.keyfile}" /> <fileset basedir="${nant.schema.dir}"> ! <include name="*" /> </fileset> </component> ! <!-- TODO <component name="C__NAnt_Etc" id="{32F1BC49-D390-4f70-8779-876CD5830C19}" attr="2" directory="D__NANT_ETC" feature="F__Etc_NAnt"> <key file="${nant.etc.keyfile}" /> <fileset basedir="${nant.etc.dir}"> ! <include name="*" /> </fileset> </component> ! --> </components> *************** *** 249,253 **** <target name="nant.bin.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" overwrite="true" /> <echo message="${nant.bin.dir}" /> --- 247,251 ---- <target name="nant.bin.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" /> <echo message="${nant.bin.dir}" /> *************** *** 280,284 **** <key file="${nant.bin.keyfile}" /> <fileset basedir="${nant.bin.dir}"> ! <include name="**/*.*" /> </fileset> </component> --- 278,282 ---- <key file="${nant.bin.keyfile}" /> <fileset basedir="${nant.bin.dir}"> ! <include name="**/*" /> </fileset> </component> *************** *** 288,292 **** <target name="nant.doc.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" overwrite="true" /> <msm --- 286,290 ---- <target name="nant.doc.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" /> <msm *************** *** 320,324 **** <key file="${nant.doc.keyfile}" /> <fileset basedir="${nant.doc.dir}"> ! <include name="*.*" /> </fileset> </component> --- 318,322 ---- <key file="${nant.doc.keyfile}" /> <fileset basedir="${nant.doc.dir}"> ! <include name="*" /> </fileset> </component> *************** *** 326,330 **** <key file="${nant.doc.help.keyfile}" /> <fileset basedir="${nant.doc.help.dir}"> ! <include name="**/*.*" /> </fileset> </component> --- 324,328 ---- <key file="${nant.doc.help.keyfile}" /> <fileset basedir="${nant.doc.help.dir}"> ! <include name="**/*" /> </fileset> </component> *************** *** 332,336 **** <key file="${nant.doc.sdk.keyfile}" /> <fileset basedir="${nant.doc.sdk.dir}"> ! <include name="*.*" /> </fileset> </component> --- 330,334 ---- <key file="${nant.doc.sdk.keyfile}" /> <fileset basedir="${nant.doc.sdk.dir}"> ! <include name="NAnt-SDK.chm" /> </fileset> </component> *************** *** 350,359 **** <description>NAnt SDK Reference</description> </shortcut> ! </shortcuts> </msm> </target> <target name="nant.examples.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" overwrite="true" /> <msm --- 348,357 ---- <description>NAnt SDK Reference</description> </shortcut> ! </shortcuts> </msm> </target> <target name="nant.examples.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" /> <msm *************** *** 382,386 **** <key file="${nant.examples.keyfile}" /> <fileset basedir="${nant.examples.dir}"> ! <include name="**/*.*" /> </fileset> </component> --- 380,384 ---- <key file="${nant.examples.keyfile}" /> <fileset basedir="${nant.examples.dir}"> ! <include name="**/*" /> </fileset> </component> *************** *** 415,419 **** component="C__NAnt_Examples" target="[D__NANT_EXAMPLES_USERTASK]" showcmd="3" > <description>NAnt Example: UserTask</description> ! </shortcut> </shortcuts> </msm> --- 413,417 ---- component="C__NAnt_Examples" target="[D__NANT_EXAMPLES_USERTASK]" showcmd="3" > <description>NAnt Example: UserTask</description> ! </shortcut> </shortcuts> </msm> *************** *** 421,425 **** <target name="nant.src.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" overwrite="true" /> <msm --- 419,423 ---- <target name="nant.src.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" /> <msm *************** *** 446,450 **** <key file="${nant.keyfile}" /> <fileset basedir="${nant.dir}"> ! <include name="*.*" /> </fileset> </component> --- 444,448 ---- <key file="${nant.keyfile}" /> <fileset basedir="${nant.dir}"> ! <include name="*" /> </fileset> </component> *************** *** 453,457 **** <key file="${nant.src.keyfile}" /> <fileset basedir="${nant.src.dir}"> ! <include name="**/*.*" /> </fileset> </component> --- 451,455 ---- <key file="${nant.src.keyfile}" /> <fileset basedir="${nant.src.dir}"> ! <include name="**/*" /> </fileset> </component> *************** *** 460,479 **** <key file="${nant.tests.keyfile}" /> <fileset basedir="${nant.tests.dir}"> ! <include name="**/*.*" /> </fileset> </component> - </components> </msm> ! </target> ! ! ! ! ! <target name="nantcontrib.mergemodules" depends="install.prepare nantcontrib.bin.msm nantcontrib.doc.msm nantcontrib.src.msm" /> ! <target name="nantcontrib.bin.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" overwrite="true" /> <msm --- 458,472 ---- <key file="${nant.tests.keyfile}" /> <fileset basedir="${nant.tests.dir}"> ! <include name="**/*" /> </fileset> </component> </components> </msm> ! </target> ! <target name="nantcontrib.mergemodules" depends="install.prepare nantcontrib.bin.msm nantcontrib.doc.msm nantcontrib.src.msm" /> ! <target name="nantcontrib.bin.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" /> <msm *************** *** 499,503 **** <key file="${nantcontrib.bin.keyfile}" /> <fileset basedir="${nantcontrib.bin.dir}"> ! <include name="*.*" /> </fileset> </component> --- 492,496 ---- <key file="${nantcontrib.bin.keyfile}" /> <fileset basedir="${nantcontrib.bin.dir}"> ! <include name="*" /> </fileset> </component> *************** *** 507,511 **** <target name="nantcontrib.doc.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" overwrite="true" /> <msm --- 500,504 ---- <target name="nantcontrib.doc.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" /> <msm *************** *** 532,536 **** <directory name="D__NANTMENUFOLDER" foldername="NAnt" root="ProgramMenuFolder" > <directory name="D__NANTMENUFOLDER_HELP" foldername="Help" /> ! </directory> </directories> --- 525,529 ---- <directory name="D__NANTMENUFOLDER" foldername="NAnt" root="ProgramMenuFolder" > <directory name="D__NANTMENUFOLDER_HELP" foldername="Help" /> ! </directory> </directories> *************** *** 539,543 **** <key file="${nantcontrib.doc.keyfile}" /> <fileset basedir="${nantcontrib.doc.dir}"> ! <include name="*.*" /> </fileset> </component> --- 532,536 ---- <key file="${nantcontrib.doc.keyfile}" /> <fileset basedir="${nantcontrib.doc.dir}"> ! <include name="*" /> </fileset> </component> *************** *** 545,549 **** <key file="${nantcontrib.doc.help.keyfile}" /> <fileset basedir="${nantcontrib.doc.help.dir}"> ! <include name="**/*.*" /> </fileset> </component> --- 538,542 ---- <key file="${nantcontrib.doc.help.keyfile}" /> <fileset basedir="${nantcontrib.doc.help.dir}"> ! <include name="**/*" /> </fileset> </component> *************** *** 551,555 **** <key file="${nantcontrib.doc.sdk.keyfile}" /> <fileset basedir="${nantcontrib.doc.sdk.dir}"> ! <include name="*.*" /> </fileset> </component> --- 544,548 ---- <key file="${nantcontrib.doc.sdk.keyfile}" /> <fileset basedir="${nantcontrib.doc.sdk.dir}"> ! <include name="NAntContrib-SDK.chm" /> </fileset> </component> *************** *** 574,578 **** <target name="nantcontrib.src.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" overwrite="true" /> <msm --- 567,571 ---- <target name="nantcontrib.src.msm"> ! <property name="msm.id" value="${script::CreateIdGuid()}" /> <msm *************** *** 600,604 **** <key file="${nantcontrib.keyfile}" /> <fileset basedir="${nantcontrib.dir}"> ! <include name="*.*" /> </fileset> </component> --- 593,597 ---- <key file="${nantcontrib.keyfile}" /> <fileset basedir="${nantcontrib.dir}"> ! <include name="*" /> </fileset> </component> *************** *** 606,610 **** <key file="${nantcontrib.src.keyfile}" /> <fileset basedir="${nantcontrib.src.dir}"> ! <include name="**/*.*" /> </fileset> </component> --- 599,603 ---- <key file="${nantcontrib.src.keyfile}" /> <fileset basedir="${nantcontrib.src.dir}"> ! <include name="**/*" /> </fileset> </component> *************** *** 613,617 **** <key file="${nantcontrib.tests.keyfile}" /> <fileset basedir="${nantcontrib.tests.dir}"> ! <include name="**/*.*" /> </fileset> </component> --- 606,610 ---- <key file="${nantcontrib.tests.keyfile}" /> <fileset basedir="${nantcontrib.tests.dir}"> ! <include name="**/*" /> </fileset> </component> *************** *** 620,630 **** <key file="${nantcontrib.Tools.keyfile}" /> <fileset basedir="${nantcontrib.Tools.dir}"> ! <include name="**/*.*" /> </fileset> </component> - </components> </msm> </target> ! ! </project> \ No newline at end of file --- 613,621 ---- <key file="${nantcontrib.Tools.keyfile}" /> <fileset basedir="${nantcontrib.Tools.dir}"> ! <include name="**/*" /> </fileset> </component> </components> </msm> </target> ! </project> |