rpms/db4o/devel db4o-6.1-usesyslibs.patch, NONE, 1.1 db4o.spec, 1.7, 1.8
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Sat Apr 12 19:15:25 UTC 2008
- Previous message (by thread): rpms/conduit/devel .cvsignore, 1.5, 1.6 conduit.spec, 1.12, 1.13 sources, 1.5, 1.6
- Next message (by thread): rpms/gnuradio/devel gnuradio-3.1.2-gcc34.patch, NONE, 1.1 gnuradio-3.1.2-libtool.bug.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gnuradio.spec, 1.4, 1.5 sources, 1.2, 1.3 gnuradio-3.1.1-gcc34.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/db4o/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15981
Modified Files:
db4o.spec
Added Files:
db4o-6.1-usesyslibs.patch
Log Message:
use syslibs
db4o-6.1-usesyslibs.patch:
--- NEW FILE db4o-6.1-usesyslibs.patch ---
diff -up db4o-6.1/src/Db4oAdmin/Db4oAdmin/PredicateOptimizer.cs.syslibs db4o-6.1/src/Db4oAdmin/Db4oAdmin/PredicateOptimizer.cs
--- db4o-6.1/src/Db4oAdmin/Db4oAdmin/PredicateOptimizer.cs.syslibs 2008-04-09 21:50:00.000000000 -0400
+++ db4o-6.1/src/Db4oAdmin/Db4oAdmin/PredicateOptimizer.cs 2008-04-09 21:51:50.000000000 -0400
@@ -20,7 +20,7 @@ with this program; if not, write to the
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
using System;
using System.Diagnostics;
-using Cecil.FlowAnalysis.CecilUtilities;
+using Cecil.FlowAnalysis.Utilities;
using Db4objects.Db4o.Internal.Query;
using Db4objects.Db4o.Nativequery.Expr;
using Db4objects.Db4o.Query;
@@ -90,7 +90,7 @@ namespace Db4oAdmin
{
if (_context.TraceSwitch.TraceVerbose)
{
- TraceVerbose(CecilFormatter.FormatMethodBody(m));
+ TraceVerbose(Formatter.FormatMethodBody(m));
}
}
diff -up db4o-6.1/src/Db4oAdmin/Db4oAdmin/SodaEmitterVisitor.cs.syslibs db4o-6.1/src/Db4oAdmin/Db4oAdmin/SodaEmitterVisitor.cs
--- db4o-6.1/src/Db4oAdmin/Db4oAdmin/SodaEmitterVisitor.cs.syslibs 2008-04-09 21:48:19.000000000 -0400
+++ db4o-6.1/src/Db4oAdmin/Db4oAdmin/SodaEmitterVisitor.cs 2008-04-09 21:52:17.000000000 -0400
@@ -102,7 +102,7 @@ namespace Db4oAdmin
EmitBinaryExpression(expression, _Constraint_Or);
}
- private void EmitBinaryExpression(BinaryExpression expression, MethodReference op)
+ private void EmitBinaryExpression(Db4objects.Db4o.Nativequery.Expr.BinaryExpression expression, MethodReference op)
{
EnterExpression();
expression.Left().Accept(this);
@@ -246,7 +246,7 @@ namespace Db4oAdmin
private static FieldReference GetFieldReference(FieldValue operand)
{
- return (FieldReference)((IFieldReferenceExpression) operand.Tag()).Field;
+ return (FieldReference)((FieldReferenceExpression) operand.Tag()).Field;
}
public void Visit(CandidateFieldRoot root)
@@ -282,4 +282,4 @@ namespace Db4oAdmin
return string.Join(", ", values);
}
}
-}
\ No newline at end of file
+}
diff -up db4o-6.1/src/Db4oAdmin/Makefile.syslibs db4o-6.1/src/Db4oAdmin/Makefile
--- db4o-6.1/src/Db4oAdmin/Makefile.syslibs 2007-02-19 19:24:23.000000000 -0500
+++ db4o-6.1/src/Db4oAdmin/Makefile 2008-04-09 21:45:23.000000000 -0400
@@ -5,4 +5,4 @@ WORKDIR = Db4oAdmin
TARGET = exe
ASSEMBLY = $(ADMIN)
-REFERENCES = -r:$(OUTDIR)/$(TOOLS) -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS) -r:$(OUTDIR)/$(GETOPTIONS)
+REFERENCES = -r:$(OUTDIR)/$(TOOLS) -r:$(OUTDIR)/$(CORE) -r:$(CECIL) -r:$(FLOWANALYSIS) -r:$(GETOPTIONS)
diff -up db4o-6.1/src/Db4objects.Db4o.Tools/Db4objects.Db4o.Tools/NativeQueries/QueryExpressionBuilder.cs.syslibs db4o-6.1/src/Db4objects.Db4o.Tools/Db4objects.Db4o.Tools/NativeQueries/QueryExpressionBuilder.cs
--- db4o-6.1/src/Db4objects.Db4o.Tools/Db4objects.Db4o.Tools/NativeQueries/QueryExpressionBuilder.cs.syslibs 2007-02-19 19:24:23.000000000 -0500
+++ db4o-6.1/src/Db4objects.Db4o.Tools/Db4objects.Db4o.Tools/NativeQueries/QueryExpressionBuilder.cs 2008-04-09 21:47:16.000000000 -0400
@@ -29,7 +29,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
using Cecil.FlowAnalysis;
using Cecil.FlowAnalysis.ActionFlow;
using Cecil.FlowAnalysis.CodeStructure;
- using AstExpression = Cecil.FlowAnalysis.CodeStructure.IExpression;
+ using AstExpression = Cecil.FlowAnalysis.CodeStructure.Expression;
using Db4objects.Db4o.Nativequery.Expr;
using Db4objects.Db4o.Nativequery.Expr.Cmp;
@@ -163,7 +163,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
private static AstExpression GetQueryExpression(MethodDefinition method)
{
- IActionFlowGraph afg = FlowGraphFactory.CreateActionFlowGraph(FlowGraphFactory.CreateControlFlowGraph(method));
+ ActionFlowGraph afg = FlowGraphFactory.CreateActionFlowGraph(FlowGraphFactory.CreateControlFlowGraph(method));
return GetQueryExpression(afg);
}
@@ -177,16 +177,16 @@ namespace Db4objects.Db4o.Tools.NativeQu
UnsupportedPredicate("Unsupported expression: " + ExpressionPrinter.ToString(node));
}
- private static AstExpression GetQueryExpression(IActionFlowGraph afg)
+ private static AstExpression GetQueryExpression(ActionFlowGraph afg)
{
Hashtable variables = new Hashtable();
- IActionBlock block = afg.Blocks[0];
+ ActionBlock block = afg.Blocks[0];
while (block != null)
{
switch (block.ActionType)
{
case ActionType.Invoke:
- UnsupportedExpression(((IInvokeActionBlock)block).Expression);
+ UnsupportedExpression(((InvokeActionBlock)block).Expression);
break;
case ActionType.ConditionalBranch:
@@ -194,14 +194,14 @@ namespace Db4objects.Db4o.Tools.NativeQu
break;
case ActionType.Branch:
- block = ((IBranchActionBlock)block).Target;
+ block = ((BranchActionBlock)block).Target;
break;
case ActionType.Assign:
{
- IAssignActionBlock assignBlock = (IAssignActionBlock)block;
- IAssignExpression assign = assignBlock.AssignExpression;
- IVariableReferenceExpression variable = assign.Target as IVariableReferenceExpression;
+ AssignActionBlock assignBlock = (AssignActionBlock)block;
+ AssignExpression assign = assignBlock.AssignExpression;
+ VariableReferenceExpression variable = assign.Target as VariableReferenceExpression;
if (null == variable)
{
UnsupportedExpression(assign);
@@ -218,8 +218,8 @@ namespace Db4objects.Db4o.Tools.NativeQu
case ActionType.Return:
{
- AstExpression expression = ((IReturnActionBlock)block).Expression;
- IVariableReferenceExpression variable = expression as IVariableReferenceExpression;
+ AstExpression expression = ((ReturnActionBlock)block).Expression;
+ VariableReferenceExpression variable = expression as VariableReferenceExpression;
return null == variable
? expression
: (AstExpression)variables[variable.Variable.Index];
@@ -299,22 +299,22 @@ namespace Db4objects.Db4o.Tools.NativeQu
get { return _insideCandidate > 0; }
}
- public override void Visit(IAssignExpression node)
+ public override void Visit(AssignExpression node)
{
UnsupportedExpression(node);
}
- public override void Visit(IVariableReferenceExpression node)
+ public override void Visit(VariableReferenceExpression node)
{
UnsupportedExpression(node);
}
- public override void Visit(IArgumentReferenceExpression node)
+ public override void Visit(ArgumentReferenceExpression node)
{
UnsupportedExpression(node);
}
- public override void Visit(IUnaryExpression node)
+ public override void Visit(UnaryExpression node)
{
switch (node.Operator)
{
@@ -329,7 +329,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
}
}
- public override void Visit(IBinaryExpression node)
+ public override void Visit(Cecil.FlowAnalysis.CodeStructure.BinaryExpression node)
{
switch (node.Operator)
{
@@ -419,9 +419,9 @@ namespace Db4objects.Db4o.Tools.NativeQu
return value.Root() is CandidateFieldRoot;
}
- public override void Visit(IMethodInvocationExpression node)
+ public override void Visit(MethodInvocationExpression node)
{
- IMethodReferenceExpression methodRef = node.Target as IMethodReferenceExpression;
+ MethodReferenceExpression methodRef = node.Target as MethodReferenceExpression;
if (null == methodRef)
UnsupportedExpression(node);
@@ -446,7 +446,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
return type.FullName == "System.String";
}
- private void ProcessStringMethod(IMethodInvocationExpression node, IMethodReferenceExpression methodRef)
+ private void ProcessStringMethod(MethodInvocationExpression node, MethodReferenceExpression methodRef)
{
MethodReference method = methodRef.Method;
@@ -480,7 +480,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
}
}
- private void ProcessRegularMethodInvocation(IMethodInvocationExpression node, IMethodReferenceExpression methodRef)
+ private void ProcessRegularMethodInvocation(MethodInvocationExpression node, MethodReferenceExpression methodRef)
{
if (node.Arguments.Count != 0)
UnsupportedExpression(node);
@@ -505,7 +505,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
}
}
- private void ProcessOperatorMethodInvocation(IMethodInvocationExpression node, MethodReference method)
+ private void ProcessOperatorMethodInvocation(MethodInvocationExpression node, MethodReference method)
{
switch (method.Name)
{
@@ -544,7 +544,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
}
}
- private void ProcessCandidateMethodInvocation(IMethodInvocationExpression node, IMethodReferenceExpression methodRef)
+ private void ProcessCandidateMethodInvocation(MethodInvocationExpression node, MethodReferenceExpression methodRef)
{
MethodDefinition method = GetMethodDefinition(methodRef);
if (null == method)
@@ -567,13 +567,13 @@ namespace Db4objects.Db4o.Tools.NativeQu
}
}
- private void AssertMethodCanBeVisited(IMethodInvocationExpression node, MethodDefinition method)
+ private void AssertMethodCanBeVisited(MethodInvocationExpression node, MethodDefinition method)
{
if (_methodDefinitionStack.Contains(method))
UnsupportedExpression(node);
}
- private MethodDefinition GetMethodDefinition(IMethodReferenceExpression methodRef)
+ private MethodDefinition GetMethodDefinition(MethodReferenceExpression methodRef)
{
MethodDefinition definition = methodRef.Method as MethodDefinition;
return definition != null
@@ -581,7 +581,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
: LoadExternalMethodDefinition(methodRef);
}
- private MethodDefinition LoadExternalMethodDefinition(IMethodReferenceExpression methodRef)
+ private MethodDefinition LoadExternalMethodDefinition(MethodReferenceExpression methodRef)
{
MethodReference method = methodRef.Method;
AssemblyDefinition assemblyDef = GetContainingAssembly(method.DeclaringType);
@@ -621,13 +621,13 @@ namespace Db4objects.Db4o.Tools.NativeQu
return !method.HasThis && method.Name.StartsWith("op_") && 2 == method.Parameters.Count;
}
- public override void Visit(IFieldReferenceExpression node)
+ public override void Visit(FieldReferenceExpression node)
{
AstExpression target = node.Target;
switch (target.CodeElementType)
{
case CodeElementType.ArgumentReferenceExpression:
- //IArgumentReferenceExpression arg = (IArgumentReferenceExpression)target;
+ //ArgumentReferenceExpression arg = (ArgumentReferenceExpression)target;
Push(new FieldValue(CandidateFieldRoot.INSTANCE, node.Field.Name, node));
break;
@@ -662,7 +662,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
}
}
- public override void Visit(ILiteralExpression node)
+ public override void Visit(LiteralExpression node)
{
Push(new ConstValue(node.Value));
}
@@ -757,7 +757,7 @@ namespace Db4objects.Db4o.Tools.NativeQu
private static TypeReference GetFieldType(FieldValue field)
{
- return ((IFieldReferenceExpression) field.Tag()).Field.FieldType;
+ return ((FieldReferenceExpression) field.Tag()).Field.FieldType;
}
private void AdjustConstValue(TypeReference typeRef, ConstValue constValue)
@@ -785,4 +785,4 @@ namespace Db4objects.Db4o.Tools.NativeQu
return LoadAssembly(moduleDef.Assembly.Name);
}
}
-}
\ No newline at end of file
+}
diff -up db4o-6.1/src/Db4objects.Db4o.Tools/Makefile.syslibs db4o-6.1/src/Db4objects.Db4o.Tools/Makefile
--- db4o-6.1/src/Db4objects.Db4o.Tools/Makefile.syslibs 2007-02-19 19:24:24.000000000 -0500
+++ db4o-6.1/src/Db4objects.Db4o.Tools/Makefile 2008-04-09 21:45:23.000000000 -0400
@@ -3,4 +3,4 @@ include ../include.mk
TARGET = library
ASSEMBLY = $(TOOLS)
-REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(OUTDIR)/$(CECIL) -r:$(OUTDIR)/$(FLOWANALYSIS)
+REFERENCES = -r:$(OUTDIR)/$(CORE) -r:$(CECIL) -r:$(FLOWANALYSIS)
diff -up db4o-6.1/src/Makefile.syslibs db4o-6.1/src/Makefile
--- db4o-6.1/src/Makefile.syslibs 2007-02-19 19:24:24.000000000 -0500
+++ db4o-6.1/src/Makefile 2008-04-09 21:45:23.000000000 -0400
@@ -15,7 +15,7 @@ all: prebuild build postbuild
prebuild:
[ -d $(OUTDIR) ] || mkdir $(OUTDIR)
- cp $(LIBS)/*.dll $(OUTDIR)
+ # cp $(LIBS)/*.dll $(OUTDIR)
build: tests admin
Index: db4o.spec
===================================================================
RCS file: /cvs/pkgs/rpms/db4o/devel/db4o.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- db4o.spec 19 Feb 2008 18:47:57 -0000 1.7
+++ db4o.spec 12 Apr 2008 19:14:46 -0000 1.8
@@ -1,15 +1,19 @@
%define debug_package %{nil}
+%define cecilver %(gacutil -l Mono.Cecil |grep Mono.Cecil |cut -d "=" -f 2 |cut -d "," -f 1)
+%define ceciltoken %(gacutil -l Mono.Cecil |grep Mono.Cecil |cut -d "=" -f 4)
Summary: A native OODBMS for Java/.NET/Mono - Mono version
Name: db4o
Version: 6.1
-Release: 3%{?dist}
-License: GPL
+Release: 4%{?dist}
+License: GPLv2
+Patch0: db4o-6.1-usesyslibs.patch
Group: Development/Libraries
Source: http://213.203.204.172/downloads/%{name}-%{version}-mono.tar.gz
URL: http://www.db4o.com/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-devel
+BuildRequires: mono-devel, mono-cecil-flowanalysis-devel
+ExcludeArch: ppc64
%description
Embed db4o's native Java or .NET/Mono open source object database
@@ -34,9 +38,14 @@
%prep
%setup -q
+%patch0 -p1 -b .syslibs
#sed -i 's/\r//' doc/tutorial/vb/index.html
#sed -i 's/\r//' doc/tutorial/index.html
sed 's!/usr/lib!%{_libdir}!' -i Makefile
+rm -rf src/Libs/*
+sed -i 's|Mono.Cecil.dll|%{_libdir}/mono/gac/Mono.Cecil/%{cecilver}__%{ceciltoken}/Mono.Cecil.dll|' src/include.mk
+sed -i 's|Cecil.FlowAnalysis.dll|%{_libdir}/mono/Cecil.FlowAnalysis/Cecil.FlowAnalysis.dll|' src/include.mk
+sed -i 's|Mono.GetOptions.dll|%{_libdir}/mono/2.0/Mono.GetOptions.dll|' src/include.mk
%build
rm -rf %{buildroot}
@@ -97,6 +106,9 @@
%{_libdir}/pkgconfig/db4o.pc
%changelog
+* Wed Apr 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 6.1-4
+- rework package to use system libraries, not bundled binary copies
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 6.1-3
- Autorebuild for GCC 4.3
- Previous message (by thread): rpms/conduit/devel .cvsignore, 1.5, 1.6 conduit.spec, 1.12, 1.13 sources, 1.5, 1.6
- Next message (by thread): rpms/gnuradio/devel gnuradio-3.1.2-gcc34.patch, NONE, 1.1 gnuradio-3.1.2-libtool.bug.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gnuradio.spec, 1.4, 1.5 sources, 1.2, 1.3 gnuradio-3.1.1-gcc34.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list