Shingle/spud.patch at master · shingleproject/Shingle · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
diff -Naur spud/Makefile.in spud_patched/Makefile.in
--- spud/Makefile.in
+++ spud_patched/Makefile.in
@@ -29,6 +29,8 @@
 FC      = @FC@
 FCFLAGS = -Iinclude @CPPFLAGS@ @FCFLAGS@

+CC     = @CC@
+
 CXX     = @CXX@
 CXXFLAGS= -Iinclude @CPPFLAGS@ @CXXFLAGS@

@@ -95,9 +97,9 @@
 install-diamond:
 	cd diamond;	python setup.py install --prefix=$(DESTDIR)@prefix@; cd ..

-install-pyspud:
+install-pyspud: libspud.la
 ifeq ($(origin BUILDING_DEBIAN),undefined)
-	cd python; python setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
+	cd python; CC=$(CC) python setup.py install --prefix=$(DESTDIR)@prefix@; cd ..
 else
 	cd python; for python in $(shell pyversions -r); do $$python setup.py install --prefix=$(DESTDIR)@prefix@ --install-layout=deb; done; cd ..
 endif
diff -Naur spud/python/setup.py spud_patched/python/setup.py
--- spud/python/setup.py
+++ spud_patched/python/setup.py
@@ -1,7 +1,8 @@
 from distutils.core import setup, Extension
 import os.path

-module1 = Extension('libspud', sources = ['libspud.c'], libraries=["spud"], library_dirs=[os.path.abspath("..")], include_dirs=[os.path.abspath("../include")])
+module1 = Extension('libspud', sources = ['libspud.c'], libraries=["spud"], library_dirs=[os.path.abspath("..")], include_dirs=[os.path.abspath("../include")],
+             extra_link_args=['-flat_namespace', '-lstdc++'])

 setup (name = 'libspud',
        version = '1.1.3',
--- spud/bin/spud-preprocess.in
+++ spud_patched/bin/spud-preprocess.in
@@ -13,4 +13,7 @@

 cp @prefix@/share/spud/spud_base.rnc $(dirname $1)
 trang $1 ${1/rnc/rng}
+stat=$?
 rm -f $(dirname $1)/spud_base.rn{c,g}
+exit $stat
+
--- spud/diamond/setup.py.in
+++ spud_patched/diamond/setup.py.in
@@ -43,7 +43,9 @@
 # on the command line in preference to the configure prefix.

 # First parse the plugin directories
-plugin_dirs = [dir for dir in os.listdir('plugins') if os.path.isdir(os.path.join('plugins', dir)) and dir[0] != '.']
+plugin_dirs = []
+if os.path.exists('plugins'):
+  plugin_dirs = [dir for dir in os.listdir('plugins') if os.path.isdir(os.path.join('plugins', dir)) and dir[0] != '.']
 plugin_data_files = []
 if sys.platform == 'darwin' and packaging:
 	for plugin in plugin_dirs:
@@ -73,11 +73,11 @@

 # We now have all the information we need; run setup.
 setup(
-      name='diamond',
+      name='spud-diamond',
-      version='1.0',
+      version='1.0.1',
-      description="Fluidity preprocessor",
+      description="Model option preprocessor",
       author = "The ICOM team",
-      author_email = "patrick.farrell@imperial.ac.uk",
+      author_email = "contact@shingleproject.org",
       url = "http://amcg.ese.ic.ac.uk",
       packages = ['diamond'],
       package_dir = {'diamond': 'diamond'},
       scripts=["bin/diamond"],
       data_files = gui_data_files + plugin_data_files
+          + [('', ['README.txt', 'COPYING', 'GPL-3'])],
      )

--- spud/dxdiff/setup.py
+++ spud_patched/dxdiff/setup.py
@@ -13,7 +13,7 @@ setup(
       version='1.0',
       description="An XML aware diff tool.",
       author = "The ICOM team",
-      author_email = "fraser.waters08@imperial.ac.uk",
+      author_email = "contact@shingleproject.org",
       url = "http://amcg.ese.ic.ac.uk",
       packages = ['dxdiff'],
       scripts=["dxdiff/dxdiff"],