[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-45-g0014e99
Alexander Dreyer
adreyer at gmx.de
Mon Jan 7 23:34:48 UTC 2013
The following commit has been merged in the master branch:
commit 8b62dddd3b2481800fa92721b43e7a5df22a5e17
Author: Alexander Dreyer <adreyer at gmx.de>
Date: Mon Jan 7 15:13:05 2013 +0100
Unapply patches
diff --git a/SConstruct b/SConstruct
index 1c31036..1970764 100644
--- a/SConstruct
+++ b/SConstruct
@@ -15,6 +15,7 @@ except:
pborirelease = "0"
+libraryversion = "0.0.0"
debname = "polybori-" + pboriversion + '.' + pborirelease
import tarfile
@@ -407,7 +408,7 @@ def setup_env(defaultenv):
opts.Add('SHLIBVERSIONSUFFIX',
'Shared libraries suffix for library versioning.',
'-' + pboriversion +'.' + pborirelease +
- defaultenv['SHLIBSUFFIX'] + '.$LIBRARY_VERSION')
+ defaultenv['SHLIBSUFFIX'] + '.' + libraryversion)
@@ -431,14 +432,8 @@ def setup_env(defaultenv):
if var != "LIBSUFFIX":
print "Variable", var, "not in default environment!"
- opts.Add('LIBRARY_VERSION', "libtool-style library version", '0.0.0')
-
opts.Add('CONFFILE', "Dump settings to file, if given", '')
- opts.Add('PKGCONFIGPATH',
- "Write settings to pkg-config file in path, if given", '')
- opts.Add('TMPINSTALLDIR', "Temporary installation directory, if given", '')
-
opts.Add('PLATFORM', "Manually set another platform (unusual)",
defaultenv['PLATFORM'])
@@ -931,12 +926,12 @@ def SymlinkReadableLibname(files):
result = []
import re
soPattern = re.compile('(.*)\.[0-9]*\.[0-9]*$', re.I|re.S)
- sonameversion = soPattern.findall(path.basename(env.subst('$LIBRARY_VERSION')))[0]
+ sonameversion = soPattern.findall(path.basename(libraryversion))[0]
for fname in files:
fname = str(fname)
soname = soPattern.sub(r'\1', fname)
- versionname = fname.replace('.' + env.subst('$LIBRARY_VERSION'), '')
+ versionname = fname.replace('.' + libraryversion, '')
simple = fname.replace(suffix, simplesuffix)
for (dest, src) in [(soname, fname), (versionname, soname),
@@ -1749,44 +1744,6 @@ if 'install' in COMMAND_LINE_TARGETS:
env.AlwaysBuild(conffile)
env.Alias('install', conffile)
- pkgconfigdirname = env['PKGCONFIGPATH']
- if pkgconfigdirname:
- def build_pcfile(target, source, env):
- localenv = source[0].get_env()
- libflags = localenv.subst("$LINKFLAGS $_LIBDIRFLAGS $_LIBFLAGS ${_stripixes(LIBLINKPREFIX, GD_LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)}");
- libs = ' '.join(set([l.replace('-l','') for l in libflags.split()
- if l.startswith('-l')]))
- page = """
-prefix=$PREFIX
-exec_prefix=$${prefix}
-includedir=$DEVEL_INCLUDE_PREFIX
-libdir=$DEVEL_LIB_PREFIX
-
-Name: %s
-Description: The PolyBoRi library
-URL: http://polybori.sourceforge.net
-Version: %s
-Requires: %s
-Cflags: $CXXFLAGS $CCFLAGS $_CCCOMCOM
-Libs: %s
- """ % (env.File(target[0]).name.replace('.pc',''),
- pboriversion + '.' + pborirelease,
- libs, libflags)
- page = localenv.subst_target_source(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
- open(str(target[0]), 'w').writelines(page)
-
- return None
-
- pcfiles = [env.Command(path.join(pkgconfigdirname,
- "polybori-groebner.pc"),
- libgbShared, build_pcfile),
- env.Command(path.join(pkgconfigdirname,
- "polybori.pc"), libpbShared, build_pcfile)
- ]
-
- env.AlwaysBuild(pcfiles)
- env.Alias('install', pcfiles)
-
env.Alias('prepare-devel', dylibs + stlibs + readabledevellibs)
env.Alias('prepare-install', [pyroot, DocPath()])
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index e735c13..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,8 +0,0 @@
-# see git-dpm(1) from git-dpm package
-2d68d516313ad44948c658adc23267f86516ad1e
-2d68d516313ad44948c658adc23267f86516ad1e
-e5a4adaad3ecd179efa65c49d85e8c7770e278ad
-e5a4adaad3ecd179efa65c49d85e8c7770e278ad
-polybori-0.8.2.orig.tar.gz
-f3b00d9be704d7b385347daa6e4fb2d8e7da17d5
-2731004
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index 909da80..0000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SUBDIRS=python tutorial
-
-all:
-
-clean: clean-recursive
-
-%-recursive:
- for i in $(SUBDIRS); do $(MAKE) -C $$i $*; done
diff --git a/doc/python/Makefile b/doc/python/Makefile
deleted file mode 100644
index bbc5564..0000000
--- a/doc/python/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-
-all:
-
-clean:
- rm -f polybori.addition.html
- rm -f polybori.cluster.html
- rm -f polybori.cnf.html
- rm -f polybori.context.html
- rm -f polybori.easy_polynomials.html
- rm -f polybori.fglm.html
- rm -f polybori.intersect.html
- rm -f polybori.intpolys.html
- rm -f polybori.parallel.html
- rm -f polybori.parsegat.html
- rm -f polybori.plot.html
- rm -f polybori.rank.html
-
diff --git a/doc/tutorial/Makefile b/doc/tutorial/Makefile
deleted file mode 100644
index 47d7100..0000000
--- a/doc/tutorial/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-
-all:
-
-clean:
- rm -f tutorial.4ct
- rm -f tutorial.4tc
- rm -f tutorial.aux
- rm -f tutorial.css
- rm -f tutorial.dvi
- rm -f tutorial.html
- rm -f tutorial.idv
- rm -f tutorial.lg
- rm -f tutorialli1.html
- rm -f tutorial.log
- rm -f tutorialse1.html
- rm -f tutorialse2.html
- rm -f tutorialse3.html
- rm -f tutorialse4.html
- rm -f tutorial.tmp
- rm -f tutorial.xref
-
diff --git a/gui/PolyGUI b/gui/PolyGUI
index 0b5864a..e9d1b43 100755
--- a/gui/PolyGUI
+++ b/gui/PolyGUI
@@ -528,21 +528,18 @@ class BoxLayout(QtGui.QWidget):
options.ordering='block_' + options.ordering
#mydata=load_file('/p/sys/IndAlg/share/data/uf20_45.py')
mydata=load_file(self.filename)
-
- ring = mydata.r.clone(ordering=getattr(OrderCode, options.ordering))
- I = [ring(p) for p in mydata.ideal]
+ I=mydata.ideal
t=time()
tc=clock()
-
-
+
+ change_ordering(getattr(OrderCode, options.ordering))
if match("block",options.ordering):
block_starts=parse_blocks(options.blocks,mydata)
block_starts.sort()
for s in block_starts:
append_ring_block(s)
-
if not options.auto:
- I = groebner_basis(I, **dict([(k,getattr(options,k)) for k in dir(options)]))
+ I = groebner_basis(I, **dict([(k,getattr(options,k)) for k in dir(options) if k in groebner_basis.options]))
else:
I= groebner_basis(I,prot=options.prot)
--
polybori: Polynomials over Boolean Rings
More information about the debian-science-commits
mailing list