fix setup/debian build/version
This commit is contained in:
parent
319389af08
commit
eeee27a08c
10 changed files with 57 additions and 75 deletions
70
setup.py
70
setup.py
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
|
||||
### BEGIN LICENSE
|
||||
# Copyright (C) 2010 jan gerber <j@mailb.org>
|
||||
|
|
@ -17,12 +17,7 @@
|
|||
|
||||
###################### DO NOT TOUCH THIS (HEAD TO THE SECOND PART) ######################
|
||||
|
||||
try:
|
||||
import DistUtilsExtra.auto
|
||||
except ImportError:
|
||||
import sys
|
||||
print >> sys.stderr, 'To build calcool you need https://launchpad.net/python-distutils-extra'
|
||||
sys.exit(1)
|
||||
import DistUtilsExtra.auto
|
||||
|
||||
assert DistUtilsExtra.auto.__version__ >= '2.10', 'needs DistUtilsExtra.auto >= 2.10'
|
||||
import os
|
||||
|
|
@ -31,25 +26,21 @@ import os
|
|||
def update_data_path(prefix, oldvalue=None):
|
||||
|
||||
try:
|
||||
fin = file('calcool/calcoolconfig.py', 'r')
|
||||
fout = file(fin.name + '.new', 'w')
|
||||
|
||||
for line in fin:
|
||||
fields = line.split(' = ') # Separate variable from value
|
||||
if fields[0] == '__calcool_data_directory__':
|
||||
# update to prefix, store oldvalue
|
||||
if not oldvalue:
|
||||
oldvalue = fields[1]
|
||||
line = "%s = '%s'\n" % (fields[0], prefix)
|
||||
else: # restore oldvalue
|
||||
line = "%s = %s" % (fields[0], oldvalue)
|
||||
fout.write(line)
|
||||
|
||||
fout.flush()
|
||||
fout.close()
|
||||
fin.close()
|
||||
with open('calcool/calcoolconfig.py', 'r') as fin:
|
||||
with open(fin.name + '.new', 'w') as fout:
|
||||
for line in fin:
|
||||
fields = line.split(' = ') # Separate variable from value
|
||||
if fields[0] == '__calcool_data_directory__':
|
||||
# update to prefix, store oldvalue
|
||||
if not oldvalue:
|
||||
oldvalue = fields[1]
|
||||
line = "%s = '%s'\n" % (fields[0], prefix)
|
||||
else: # restore oldvalue
|
||||
line = "%s = %s" % (fields[0], oldvalue)
|
||||
fout.write(line)
|
||||
fout.flush()
|
||||
os.rename(fout.name, fin.name)
|
||||
except (OSError, IOError), e:
|
||||
except (OSError, IOError) as e:
|
||||
print ("ERROR: Can't find calcool/calcoolconfig.py")
|
||||
sys.exit(1)
|
||||
return oldvalue
|
||||
|
|
@ -58,18 +49,15 @@ def update_data_path(prefix, oldvalue=None):
|
|||
def update_desktop_file(datadir):
|
||||
|
||||
try:
|
||||
fin = file('calcool.desktop.in', 'r')
|
||||
fout = file(fin.name + '.new', 'w')
|
||||
|
||||
for line in fin:
|
||||
if 'Icon=' in line:
|
||||
line = "Icon=%s\n" % (datadir + 'media/logo.png')
|
||||
fout.write(line)
|
||||
fout.flush()
|
||||
fout.close()
|
||||
fin.close()
|
||||
with open('calcool.desktop.in', 'r') as fin:
|
||||
with open(fin.name + '.new', 'w') as fout:
|
||||
for line in fin:
|
||||
if 'Icon=' in line:
|
||||
line = "Icon=%s\n" % (datadir + 'media/logo.png')
|
||||
fout.write(line)
|
||||
fout.flush()
|
||||
os.rename(fout.name, fin.name)
|
||||
except (OSError, IOError), e:
|
||||
except (OSError, IOError) as e:
|
||||
print ("ERROR: Can't find calcool.desktop.in")
|
||||
sys.exit(1)
|
||||
|
||||
|
|
@ -77,9 +65,9 @@ def update_desktop_file(datadir):
|
|||
class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
|
||||
def run(self):
|
||||
if self.root or self.home:
|
||||
print "WARNING: You don't use a standard --prefix installation, take care that you eventually " \
|
||||
print("WARNING: You don't use a standard --prefix installation, take care that you eventually " \
|
||||
"need to update quickly/quicklyconfig.py file to adjust __quickly_data_directory__. You can " \
|
||||
"ignore this warning if you are packaging and uses --prefix."
|
||||
"ignore this warning if you are packaging and uses --prefix.")
|
||||
previous_value = update_data_path(self.prefix + '/share/calcool/')
|
||||
update_desktop_file(self.prefix + '/share/calcool/')
|
||||
DistUtilsExtra.auto.install_auto.run(self)
|
||||
|
|
@ -93,13 +81,13 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
|
|||
|
||||
DistUtilsExtra.auto.setup(
|
||||
name='calcool',
|
||||
version='12.06',
|
||||
version='25.01',
|
||||
license='GPL-3',
|
||||
author='j^',
|
||||
author='Jan Gerber',
|
||||
author_email='j@mailb.org',
|
||||
description='A document based calculator tool',
|
||||
long_description='Calcool allows you to do calculations in a document, on the right you have the result for each line. If you ever used bc and wanted to edit a previous line or tried to reference the result of line 3, calcool might be what you are looking for.',
|
||||
url='https://launchpad.net/calcool',
|
||||
url='https://code.0x2620.org/j/calcool',
|
||||
cmdclass={'install': InstallAndUpdateDataDirectory},
|
||||
data_files=[
|
||||
('share/mime/packages', ['calcool.xml']),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue