Franck Pommereau

fixed packaging

1 dist/* 1 dist/*
2 +build/
2 dput.sh 3 dput.sh
3 *.pyc 4 *.pyc
4 *~ 5 *~
......
...@@ -6,10 +6,10 @@ MANIFEST.in ...@@ -6,10 +6,10 @@ MANIFEST.in
6 Makefile 6 Makefile
7 README.md 7 README.md
8 VERSION 8 VERSION
9 -mkdeb.py
10 mklang.py 9 mklang.py
11 setup.py 10 setup.py
12 test.py 11 test.py
12 +version.py
13 bin/abcd 13 bin/abcd
14 bin/snkc 14 bin/snkc
15 bin/snkd 15 bin/snkd
...@@ -92,7 +92,37 @@ snakes/utils/abcd/resources/model.html ...@@ -92,7 +92,37 @@ snakes/utils/abcd/resources/model.html
92 snakes/utils/abcd/resources/model.js 92 snakes/utils/abcd/resources/model.js
93 snakes/utils/abcd/resources/simulator.css 93 snakes/utils/abcd/resources/simulator.css
94 snakes/utils/abcd/resources/simulator.js 94 snakes/utils/abcd/resources/simulator.js
95 +snakes/utils/abcd/resources/css/bootstrap-theme.css
96 +snakes/utils/abcd/resources/css/bootstrap-theme.css.map
97 +snakes/utils/abcd/resources/css/bootstrap.css
98 +snakes/utils/abcd/resources/css/bootstrap.css.map
99 +snakes/utils/abcd/resources/css/docs.css
100 +snakes/utils/abcd/resources/fonts/glyphicons-halflings-regular.eot
101 +snakes/utils/abcd/resources/fonts/glyphicons-halflings-regular.svg
102 +snakes/utils/abcd/resources/fonts/glyphicons-halflings-regular.ttf
103 +snakes/utils/abcd/resources/fonts/glyphicons-halflings-regular.woff
104 +snakes/utils/abcd/resources/js/bootstrap.file-input.js
105 +snakes/utils/abcd/resources/js/bootstrap.min.js
106 +snakes/utils/abcd/resources/js/petri.js
95 snakes/utils/ctlstar/__init__.py 107 snakes/utils/ctlstar/__init__.py
96 snakes/utils/ctlstar/build.py 108 snakes/utils/ctlstar/build.py
109 +snakes/utils/simul/__init__.py
110 +snakes/utils/simul/html.py
111 +snakes/utils/simul/httpd.py
112 +snakes/utils/simul/logger.py
113 +snakes/utils/simul/resources/about.css
114 +snakes/utils/simul/resources/about.html
115 +snakes/utils/simul/resources/about.js
116 +snakes/utils/simul/resources/alive.txt
117 +snakes/utils/simul/resources/index.html
118 +snakes/utils/simul/resources/jquery.min.js
119 +snakes/utils/simul/resources/jquery.periodic.js
120 +snakes/utils/simul/resources/model.css
121 +snakes/utils/simul/resources/model.html
122 +snakes/utils/simul/resources/model.js
123 +snakes/utils/simul/resources/simulator.css
124 +snakes/utils/simul/resources/simulator.js
125 +snakes/utils/simul/resources/trace.css
126 +snakes/utils/simul/resources/trace.js
97 utils/abcd-mode.el 127 utils/abcd-mode.el
98 utils/abcd-mode.elc 128 utils/abcd-mode.elc
......
1 -0.9.18 1 +0.9.21
......
...@@ -15,13 +15,19 @@ def doc_files () : ...@@ -15,13 +15,19 @@ def doc_files () :
15 result[target_dir].append(os.path.join(root, name)) 15 result[target_dir].append(os.path.join(root, name))
16 return list(result.items()) 16 return list(result.items())
17 17
18 -def abcd_resources () : 18 +def resources (root) :
19 - collected = ["*.txt", "*.html", "*.css", "*.js", "*.png", "*.jpg"] 19 + collected = ["*.txt", "*.html", "*.css", "*.js", "*.png", "*.jpg",
20 - import glob, os.path 20 + "*.ttf", "*.eot", "*.woff", "*.svg" ,"*.map"]
21 + import fnmatch, os.path
21 result = [] 22 result = []
22 - for pattern in collected : 23 + baselen = len(root.rstrip(os.sep).rsplit(os.sep, 1)[0]) + len(os.sep)
23 - for path in glob.glob("snakes/utils/abcd/resources/" + pattern) : 24 + def addfiles (_, dirname, filenames) :
24 - result.append(os.path.join("resources", os.path.basename(path))) 25 + for name in filenames :
26 + for glob in collected :
27 + if fnmatch.fnmatch(name, glob) :
28 + result.append(os.path.join(dirname[baselen:], name))
29 + break
30 + os.path.walk(root, addfiles, None)
25 return result 31 return result
26 32
27 try : 33 try :
...@@ -51,15 +57,18 @@ if __name__ == "__main__" : ...@@ -51,15 +57,18 @@ if __name__ == "__main__" :
51 ], 57 ],
52 packages=["snakes", 58 packages=["snakes",
53 "snakes.lang", 59 "snakes.lang",
54 - "snakes.lang.pylib",
55 - "snakes.lang.python",
56 "snakes.lang.abcd", 60 "snakes.lang.abcd",
57 "snakes.lang.ctlstar", 61 "snakes.lang.ctlstar",
62 + "snakes.lang.pylib",
63 + "snakes.lang.python",
58 "snakes.plugins", 64 "snakes.plugins",
59 "snakes.utils", 65 "snakes.utils",
60 "snakes.utils.abcd", 66 "snakes.utils.abcd",
61 "snakes.utils.ctlstar", 67 "snakes.utils.ctlstar",
68 + "snakes.utils.simul",
62 ], 69 ],
63 - package_data={"snakes.utils.abcd": abcd_resources()}, 70 + package_data={"snakes.utils.abcd": resources("snakes/utils/abcd/resources/"),
71 + "snakes.utils.simul": resources("snakes/utils/simul/resources/"),
72 + },
64 data_files=doc_files() + emacs, 73 data_files=doc_files() + emacs,
65 ) 74 )
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 @contact: franck.pommereau@ibisc.univ-evry.fr 19 @contact: franck.pommereau@ibisc.univ-evry.fr
20 """ 20 """
21 21
22 -version = "0.9.18" 22 +version = "0.9.21"
23 defaultencoding = "utf-8" 23 defaultencoding = "utf-8"
24 24
25 """## Module `snakes` 25 """## Module `snakes`
......