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
|
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Change paths to match Debian and FHS
Forwarded: no
Last-Updated: 2013-12-09
Index: adios-1.10.1/utils/skel/lib/skel_makefile.py
===================================================================
--- adios-1.10.1.orig/utils/skel/lib/skel_makefile.py
+++ adios-1.10.1/utils/skel/lib/skel_makefile.py
@@ -65,7 +65,7 @@ def generate_makefile_from_yaml (args):
# Only proceed if outfilename does not already exist, or if -f was used
if os.path.exists (outfilename) and not args.force:
- print "%s exists, aborting. Delete the file or use -f to overwrite." % outfilename
+ print( "%s exists, aborting. Delete the file or use -f to overwrite." % outfilename)
return 999
skel_file = open (outfilename, 'w')
@@ -106,7 +106,7 @@ def generate_makefiles_fortran (params):
makefile_template_name = '~/.skel/templates/Makefile.default.tpl'
makefile_template = open(os.path.expanduser(makefile_template_name), 'r')
- include_statement = "" + os.path.dirname (sys.argv[0]) + '/../etc/skel/compiler_fragment.mk'
+ include_statement = '/etc/adios/skel/compiler_fragment.mk'
bindir = os.path.abspath(os.path.dirname(sys.argv[0]))
Index: adios-1.10.1/utils/skel/lib/skel_settings.py
===================================================================
--- adios-1.10.1.orig/utils/skel/lib/skel_settings.py
+++ adios-1.10.1/utils/skel/lib/skel_settings.py
@@ -54,7 +54,8 @@ def create_settings_dir_if_needed():
skel_settings_dir_name = os.path.expanduser ('~/.skel')
if not os.path.exists (skel_settings_dir_name):
bindir = os.path.dirname (sys.argv[0])
- shutil.copytree (bindir + '/../etc/skel', skel_settings_dir_name)
+ shutil.copytree ('/etc/adios/skel', skel_settings_dir_name)
+
print 'Created ' + skel_settings_dir_name
@@ -64,6 +65,3 @@ def main(argv=None):
if __name__ == "__main__":
main()
-
-
-
Index: adios-1.10.1/utils/gpp/type_mapper.py
===================================================================
--- adios-1.10.1.orig/utils/gpp/type_mapper.py
+++ adios-1.10.1/utils/gpp/type_mapper.py
@@ -1,4 +1,4 @@
-
+#!/usr/bin/env python
c_types = {
'string' : 'string',
|
