rpms/nant/devel nant-0.85-system-libs-and-no-nunit1.patch, NONE, 1.1 nant.spec, 1.19, 1.20
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Sun Apr 13 01:25:17 UTC 2008
- Previous message (by thread): rpms/taglib-sharp/F-9 taglib-sharp-2.0.3.0-fix-xml.patch, NONE, 1.1 taglib-sharp-2.0.3.0-noInjectMenuItem.patch, NONE, 1.1 taglib-sharp.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/banshee/devel .cvsignore, 1.14, 1.15 banshee.spec, 1.41, 1.42 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/nant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2992
Modified Files:
nant.spec
Added Files:
nant-0.85-system-libs-and-no-nunit1.patch
Log Message:
dont use prebuilt binary bits
nant-0.85-system-libs-and-no-nunit1.patch:
--- NEW FILE nant-0.85-system-libs-and-no-nunit1.patch ---
diff -up nant-0.85/src/NAnt.NUnit/NAnt.NUnit.build.BAD nant-0.85/src/NAnt.NUnit/NAnt.NUnit.build
--- nant-0.85/src/NAnt.NUnit/NAnt.NUnit.build.BAD 2008-04-10 16:53:11.000000000 -0400
+++ nant-0.85/src/NAnt.NUnit/NAnt.NUnit.build 2008-04-10 17:08:56.000000000 -0400
@@ -19,30 +19,6 @@
<include name="${lib.framework.dir}/nunit.framework.dll" />
</references>
</csc>
- <csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/NAnt.NUnit1Tasks.dll" doc="${build.dir}/bin/NAnt.NUnit1Tasks.xml">
- <nowarn>
- <!-- do not report warnings for missing XML comments -->
- <warning number="1591" />
- <!-- workaround for Mono bug #61902: do not report deprecation warnings -->
- <warning number="0618" if="${framework::get-family(framework::get-target-framework()) == 'mono'}" />
- </nowarn>
- <sources>
- <include name="NUnit1/**/*.cs"/>
- <!-- common assembly-level attributes -->
- <include name="../CommonAssemblyInfo.cs" />
- </sources>
- <references>
- <!-- temporary workaround for Mono Runtime bug #57602 -->
- <include name="${lib.framework.dir}/log4net.dll" />
- <!-- end workaround -->
- <include name="${build.dir}/bin/NAnt.Core.dll" />
- <include name="${build.dir}/bin/NAnt.NUnit.dll" />
- <include name="${lib.dir}/NUnitCore.dll" />
- </references>
- <resources>
- <include name="*.resx"/>
- </resources>
- </csc>
<csc target="library" define="${current.build.defines}" warnaserror="true" debug="${build.debug}" output="${build.dir}/bin/NAnt.NUnit2Tasks.dll" doc="${build.dir}/bin/NAnt.NUnit2Tasks.xml">
<nowarn>
<!-- do not report deprecation warnings -->
diff -up nant-0.85/src/NAnt.SourceControl/Tasks/AbstractCvsTask.cs.BAD nant-0.85/src/NAnt.SourceControl/Tasks/AbstractCvsTask.cs
--- nant-0.85/src/NAnt.SourceControl/Tasks/AbstractCvsTask.cs.BAD 2008-04-10 17:10:50.000000000 -0400
+++ nant-0.85/src/NAnt.SourceControl/Tasks/AbstractCvsTask.cs 2008-04-10 17:33:45.000000000 -0400
@@ -266,10 +266,12 @@ namespace NAnt.SourceControl.Tasks {
get {
if (null == base.Root) {
try {
- ICSharpCode.SharpCvsLib.FileSystem.Root root =
- ICSharpCode.SharpCvsLib.FileSystem.Root.Load(this.DestinationDirectory);
+ ICSharpCode.SharpCvsLib.FileSystem.Manager manager =
+ new ICSharpCode.SharpCvsLib.FileSystem.Manager(this.DestinationDirectory.FullName);
+ ICSharpCode.SharpCvsLib.FileSystem.Root root =
+ manager.FetchRoot(this.DestinationDirectory.FullName);
this.Root = root.FileContents;
- } catch (ICSharpCode.SharpCvsLib.Exceptions.CvsFileNotFoundException) {
+ } catch (CvsFileNotFoundException) {
throw new BuildException (string.Format("Cvs/Root file not found in {0}, please perform a checkout.",
this.DestinationDirectory.FullName));
}
@@ -296,9 +298,10 @@ namespace NAnt.SourceControl.Tasks {
get {
if (null == _module) {
try {
- Repository repository = Repository.Load(this.DestinationDirectory);
+ Manager manager = new Manager(this.DestinationDirectory.FullName);
+ Repository repository = manager.FetchRepository(this.DestinationDirectory.FullName);
this._module = repository.ModuleName;
- } catch (ICSharpCode.SharpCvsLib.Exceptions.CvsFileNotFoundException) {
+ } catch (CvsFileNotFoundException) {
throw new BuildException (string.Format("Cvs/Repository file not found in {0}, please perform a checkout.",
this.DestinationDirectory.FullName));
}
@@ -566,4 +569,4 @@ namespace NAnt.SourceControl.Tasks {
#endregion Private Instance Methods
}
-}
\ No newline at end of file
+}
diff -up nant-0.85/src/NAnt.SourceControl/Tasks/CvsPass.cs.BAD nant-0.85/src/NAnt.SourceControl/Tasks/CvsPass.cs
--- nant-0.85/src/NAnt.SourceControl/Tasks/CvsPass.cs.BAD 2008-04-10 17:34:11.000000000 -0400
+++ nant-0.85/src/NAnt.SourceControl/Tasks/CvsPass.cs 2008-04-10 17:39:11.000000000 -0400
@@ -124,17 +124,17 @@ namespace NAnt.SourceControl.Tasks {
/// </list>
/// </summary>
protected override void ExecuteTask () {
- ICSharpCode.SharpCvsLib.FileSystem.Manager manager =
- new ICSharpCode.SharpCvsLib.FileSystem.Manager(this.DestinationDirectory);
+ // ICSharpCode.SharpCvsLib.FileSystem.Manager manager =
+ // new ICSharpCode.SharpCvsLib.FileSystem.Manager(this.DestinationDirectory.FullName);
- if (this.PassFile == null) {
- manager.UpdatePassFile(this.Password,
- new ICSharpCode.SharpCvsLib.Misc.CvsRoot(this.Root));
- } else {
- Log(Level.Verbose, "Updating .cvspass file '{0}'.", this.PassFile.FullName);
- manager.UpdatePassFile(this.Password,
- new ICSharpCode.SharpCvsLib.Misc.CvsRoot(this.Root), this.PassFile);
- }
+ // if (this.PassFile == null) {
+ // manager.UpdatePassFile(this.Password,
+ // new ICSharpCode.SharpCvsLib.Misc.CvsRoot(this.Root));
+ // } else {
+ // Log(Level.Verbose, "Updating .cvspass file '{0}'.", this.PassFile.FullName);
+ // manager.UpdatePassFile(this.Password,
+ // new ICSharpCode.SharpCvsLib.Misc.CvsRoot(this.Root), this.PassFile);
+ // }
}
#endregion Override implementation of Task
Index: nant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nant/devel/nant.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nant.spec 8 Apr 2008 12:22:37 -0000 1.19
+++ nant.spec 13 Apr 2008 01:24:36 -0000 1.20
@@ -5,21 +5,23 @@
Summary: NAnt is a build tool for Mono and .NET
Name: nant
Version: 0.85
-Release: 19%{?dist}
+Release: 20%{?dist}
Epoch: 1
Source0: http://download.sourceforge.net/nant/%{name}-%{version}-src.tar.gz
Patch0: nant-build.patch
Patch1: nant-app.patch
Patch2: nant-core-task.patch
Patch3: nant-0.85-api.patch
-License: GPL
+Patch4: nant-0.85-system-libs-and-no-nunit1.patch
+License: GPLv2+
Group: Development/Tools
Url: http://nant.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-devel
+BuildRequires: mono-devel, mono-sharpcvslib-devel, log4net, mono-nunit, mono-nunit22-devel
+BuildRequires: mono-ndoc-devel
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc sparcv9 alpha
%description
NAnt is a free .NET build tool. In theory it is kind of like make
@@ -41,6 +43,7 @@
%patch0 -p1 -b .orig
%patch2 -p1 -b .orig
%patch3 -p1 -b .orig
+%patch4 -p1 -b .system
sed -i -e "s/@LIB@/%{_lib}/" NAnt.build
sed -i -e "s!@BUILDROOT@!%{buildroot}/usr!" NAnt.build
find . -type d|xargs chmod 755
@@ -49,6 +52,28 @@
sed -i 's/\r//' COPYING.txt
sed -i 's/\r//' README.txt
sed -i 's/\r//' doc/releasenotes.html
+# Clean out the prebuilt files
+rm -rf lib/*.dll lib/*.exe lib/mono/1.0/*.dll lib/mono/2.0/*.dll
+
+# Copy in the system libs
+cp -p %{_libdir}/mono/sharpcvslib/ICSharpCode.SharpCvsLib.dll lib/
+cp -p %{_libdir}/mono/1.0/ICSharpCode.SharpZipLib.dll lib/
+cp -p %{_libdir}/mono/log4net/log4net.dll lib/
+cp -p %{_libdir}/mono/sharpcvslib/cvs.exe lib/scvs.exe
+
+cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/1.0/
+cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/1.0/
+cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/1.0/
+cp -p %{_libdir}/mono/1.0/nunit.core.dll lib/mono/1.0/
+cp -p %{_libdir}/mono/1.0/nunit.framework.dll lib/mono/1.0/
+cp -p %{_libdir}/mono/1.0/nunit.util.dll lib/mono/1.0/
+
+cp -p %{_libdir}/mono/ndoc/NDoc.Core.dll lib/mono/2.0/
+cp -p %{_libdir}/mono/ndoc/NDoc.Documenter.Msdn.dll lib/mono/2.0/
+cp -p %{_libdir}/mono/ndoc/NDoc.ExtendedUI.dll lib/mono/2.0/
+cp -p %{_libdir}/mono/nunit22/nunit.core.dll lib/mono/2.0/
+cp -p %{_libdir}/mono/nunit22/nunit.framework.dll lib/mono/2.0/
+cp -p %{_libdir}/mono/nunit22/nunit.util.dll lib/mono/2.0/
%build
export MONO_PATH=%{buildroot}/%{mlib}
@@ -61,6 +86,11 @@
find examples -name \*.dll -o -name \*.exe|xargs rm -f
rm -rf %{buildroot}%{_datadir}/NAnt/doc
+# Flush out the binary bits that we used to build
+rm -rf %{buildroot}%{_libdir}/NAnt/bin/lib
+rm -rf %{buildroot}%{_libdir}/NAnt/bin/log4net.dll
+rm -rf %{buildroot}%{_libdir}/NAnt/bin/scvs.exe
+
%clean
rm -rf %{buildroot}
@@ -81,6 +111,9 @@
%doc examples/* doc/help/*
%changelog
+* Mon Apr 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.85-20
+- don't use prebuilt binary bits
+
* Mon Apr 7 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1:0.85-19
- Downgrade to 0.85 because of issues with boo package as discussed on
bug #435898). add Epoch: 1 :(
- Previous message (by thread): rpms/taglib-sharp/F-9 taglib-sharp-2.0.3.0-fix-xml.patch, NONE, 1.1 taglib-sharp-2.0.3.0-noInjectMenuItem.patch, NONE, 1.1 taglib-sharp.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/banshee/devel .cvsignore, 1.14, 1.15 banshee.spec, 1.41, 1.42 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list