rpms/sat4j/devel import.log, NONE, 1.1 sat4j-core-Dimacs-nooverrides.patch, NONE, 1.1 sat4j-core-nooverrides.patch, NONE, 1.1 sat4j-junit4fortests.patch, NONE, 1.1 sat4j.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Tue Jul 15 16:16:05 UTC 2008
Author: overholt
Update of /cvs/pkgs/rpms/sat4j/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32056/devel
Modified Files:
.cvsignore sources
Added Files:
import.log sat4j-core-Dimacs-nooverrides.patch
sat4j-core-nooverrides.patch sat4j-junit4fortests.patch
sat4j.spec
Log Message:
Initial import.
--- NEW FILE import.log ---
sat4j-2_0_0-4_fc9:HEAD:sat4j-2.0.0-4.fc9.src.rpm:1216138150
sat4j-core-Dimacs-nooverrides.patch:
--- NEW FILE sat4j-core-Dimacs-nooverrides.patch ---
--- org.sat4j.core/src/org/sat4j/tools/DimacsStringSolver.java 2008-05-25 05:07:56.000000000 -0400
+++ src/org/sat4j/tools/DimacsStringSolver.java 2008-06-10 23:32:10.000000000 -0400
@@ -274,12 +274,10 @@
}
- @Override
public boolean isDBSimplificationAllowed() {
return false;
}
- @Override
public void setDBSimplificationAllowed(boolean status) {
}
sat4j-core-nooverrides.patch:
--- NEW FILE sat4j-core-nooverrides.patch ---
--- src/org/sat4j/minisat/core/Solver.java 2008-05-25 05:07:56.000000000 -0400
+++ src/org/sat4j/minisat/core/Solver.java 2008-06-19 12:51:06.000000000 -0400
@@ -1312,12 +1312,10 @@
return null;
}
- @Override
public boolean isDBSimplificationAllowed() {
return isDBSimplificationAllowed;
}
- @Override
public void setDBSimplificationAllowed(boolean status) {
isDBSimplificationAllowed = status;
}
sat4j-junit4fortests.patch:
--- NEW FILE sat4j-junit4fortests.patch ---
Index: build.xml
===================================================================
RCS file: /cvsroot/sat4j/core/build/build.xml,v
retrieving revision 1.25
diff -u -r1.25 build.xml
--- build.xml 6 Feb 2008 22:22:51 -0000 1.25
+++ build.xml 27 Jun 2008 15:57:33 -0000
@@ -1,6 +1,7 @@
<project name="sat4j" default="continuum">
<!-- user/password settings for FTP, WWW, local settings -->
<!-- the property report.dir MUST DE DEFINED here -->
+ <property name="report.dir" value="report"/>
<property file="${user.home}/.ftp.properties"/>
<!-- other properties -->
<property name="projname" value="MINISAT"/>
@@ -36,14 +37,17 @@
<fileset dir="${lib}">
<include name="*.jar"/>
</fileset>
+ <fileset dir="..">
+ <include name="*.jar"/>
+ </fileset>
</path>
<target name="tests"
- description="Launch JUnit tests and generate a report"
- depends="build">
+ description="Launch JUnit tests and generate a report">
<echo>Compiling test files</echo>
<javac srcdir="${src}:${test}" destdir="${build}" source="1.5" debug="true">
<classpath refid="somePath"/>
+ <classpath path="/usr/share/java/junit4.jar"/>
</javac>
<echo>Running JUNIT tests</echo>
<junit printsummary="yes" haltonfailure="no" fork="yes">
--- NEW FILE sat4j.spec ---
%define eclipse_base %{_datadir}/eclipse
# We want the version to match that shipped in Eclipse's Orbit project
%define sat4jversion 2.0.0.v20080602
Name: sat4j
Version: 2.0.0
Release: 4%{?dist}
Summary: A library of SAT solvers written in Java
Group: Development/Libraries
License: EPL and LGPLv2
URL: http://www.sat4j.org/
Source0: http://forge.objectweb.org/tracker/download.php/228/350289/310427/1838/org.sat4j.core-src.zip
Source1: http://forge.objectweb.org/tracker/download.php/228/350289/310427/1839/org.sat4j.pb-src.zip
# These have been reported upstream
# http://forge.objectweb.org/tracker/index.php?func=detail&aid=310427&group_id=228&atid=350289
# There are erroneous @Overrides statements which are caught with ecj.
# We remove them.
Patch0: sat4j-core-nooverrides.patch
Patch1: sat4j-core-Dimacs-nooverrides.patch
# This is so we can run the tests. Some errors are expected; see up for
# OW tracker thread.
Patch2: sat4j-junit4fortests.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1.5
BuildRequires: junit4
BuildRequires: eclipse-pde
Requires: java >= 1.5
Requires: jpackage-utils
BuildArch: noarch
%description
The aim of the SAT4J library is to provide an efficient library of SAT
solvers in Java. The SAT4J library targets first users of SAT "black
boxes", those willing to embed SAT technologies into their application
without worrying about the details.
%prep
%setup -q -c -a 1
/bin/sh %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
pushd core
# Only used for the tests
rm lib/jmock-*.jar
echo %{sat4jversion} > src/sat4j.version
sed -i "s/9.9.9.token/%{sat4jversion}/" META-INF/MANIFEST.MF
%patch0 -p0
%patch1 -p0
mv build{,.upstream}
cd build.upstream
%patch2 -p0
sed -i "s:/usr/share/java:%{_datadir}/java:" build.xml
popd
pushd pb
sed -i "s/9.9.9.token/%{sat4jversion}/" META-INF/MANIFEST.MF
sed -i "/^Class-Path/d" META-INF/MANIFEST.MF
# Only used for the tests
rm lib/jmock-*.jar
popd
# I don't think package build can handle DOS line endings in MANIFEST.MF
dos2unix core/META-INF/MANIFEST.MF
dos2unix pb/META-INF/MANIFEST.MF
%build
SDK=$(cd SDK > /dev/null && pwd)
pushd core
mkdir home build
home=$(cd home > /dev/null && pwd)
# These can go away when package build handles plugins (not just
# features)
echo "<project default=\"main\"><target name=\"main\"></target></project>" \
> build/assemble.org.sat4j.core.all.xml
echo "<project default=\"main\"><target name=\"main\"></target></project>" \
> build/package.org.sat4j.core.all.xml
java -cp $SDK/startup.jar \
-Duser.home=$home \
-Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-Dtype=plugin \
-DjavacSource=1.5 \
-DjavacTarget=1.5 \
-Did=org.sat4j.core \
-DbaseLocation=$SDK \
-DsourceDirectory=$(pwd) \
-DbuildDirectory=$(pwd)/build \
-Dbuilder=$SDK/plugins/org.eclipse.pde.build/templates/package-build \
-f $SDK/plugins/org.eclipse.pde.build/scripts/build.xml
pushd build/plugins/org.sat4j.core/
java -cp $SDK/startup.jar \
-Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-Duser.home=$home \
-f build.xml \
build.update.jar
popd
popd
# pb depends upon core
cp -rp core/build/plugins/org.sat4j.core/org.sat4j.core_*.jar \
$SDK/plugins
# the class-path in pb's MANIFEST.MF references a versionless core jar.
CORE_VERSION=$(ls $SDK/plugins | grep org.sat4j.core | \
sed 's/org.sat4j.core_//')
sed -i "s/org.sat4j.core.jar/org.sat4j.core_$CORE_VERSION/" \
pb/META-INF/MANIFEST.MF
pushd pb
mkdir home build
home=$(cd home > /dev/null && pwd)
# These can go away when package build handles plugins (not just
# features)
echo "<project default=\"main\"><target name=\"main\"></target></project>" \
> build/assemble.org.sat4j.pb.all.xml
echo "<project default=\"main\"><target name=\"main\"></target></project>" \
> build/package.org.sat4j.pb.all.xml
java -cp $SDK/startup.jar \
-Duser.home=$home \
-Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-Dtype=plugin \
-DjavacSource=1.5 \
-DjavacTarget=1.5 \
-Did=org.sat4j.pb \
-DbaseLocation=$SDK \
-DsourceDirectory=$(pwd) \
-DbuildDirectory=$(pwd)/build \
-Dbuilder=$SDK/plugins/org.eclipse.pde.build/templates/package-build \
-f $SDK/plugins/org.eclipse.pde.build/scripts/build.xml
pushd build/plugins/org.sat4j.pb
java -cp $SDK/startup.jar \
-Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
-Duser.home=$home \
-f build.xml \
build.update.jar
popd
popd
# For testing
#cd core/build.upstream
#mkdir -p bin report/junit
#ant tests
%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
cp -rp core/build/plugins/org.sat4j.core/org.sat4j.core_*.jar \
$RPM_BUILD_ROOT%{_javadir}
cp -rp pb/build/plugins/org.sat4j.pb/org.sat4j.pb_*.jar \
$RPM_BUILD_ROOT%{_javadir}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
# No %%doc files as the about.html is in the jar
%{_javadir}/org.sat4j*
%changelog
* Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 2.0.0-4
- Remove jmock JARs
- Don't run tests as part of build
* Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 2.0.0-3
- Remove Class-Path from pb MANIFEST.MF
* Mon Jul 14 2008 Andrew Overholt <overholt at redhat.com> 2.0.0-2
- Add eclipse-pde BR for pdebuild script
* Fri Jun 27 2008 Andrew Overholt <overholt at redhat.com> 2.0.0-1
- 2.0.0
- Run tests
* Thu Mar 13 2008 Andrew Overholt <overholt at redhat.com> 2.0-0.1.RC5
- Initial version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 Jul 2008 15:47:45 -0000 1.1
+++ .cvsignore 15 Jul 2008 16:13:34 -0000 1.2
@@ -0,0 +1,2 @@
+org.sat4j.core-src.zip
+org.sat4j.pb-src.zip
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 Jul 2008 15:47:45 -0000 1.1
+++ sources 15 Jul 2008 16:13:34 -0000 1.2
@@ -0,0 +1,2 @@
+20869e6d0b69d5ad177d722d9cc6b481 org.sat4j.core-src.zip
+3ec2679335bb11cc76fe9f6ddff020fe org.sat4j.pb-src.zip
More information about the fedora-extras-commits
mailing list