[patch #2356] w32setup.py: Fonts were missing, a path was wrong, moved closer to dsetup.py

[Joonas Paalasmaa]

This mail is an automated notification from the patch tracker
 of the project: Skencil.




/**************************************************************************/
[patch #2356] Full Item Snapshot:

URL: <http://savannah.nongnu.org/patch/?func=detailitem&amp;item_id=2356>
Project: Skencil
Submitted by: Joonas Paalasmaa
On: Wed 11/26/2003 at 13:30

Category:  0.7.x
Priority:  5 - Normal
Resolution:  None
Assigned to:  None
Originator Email:  
Status:  Open


Summary:  w32setup.py: Fonts were missing, a path was wrong, moved closer to 
dsetup.py

Original Submission:  diff -c -u -r1.1 w32setup.py

--- w32setup.py 20 Nov 2003 14:43:59 -0000      1.1

+++ w32setup.py 26 Nov 2003 13:22:54 -0000

@@ -26,24 +26,16 @@

 mod_dir = "Sketch/Modules/"

 filter_dir = "Filter/"



-packages = ["Sketch.Sketch", 'Sketch.Sketch.Base', 'Sketch.Sketch.Editor',

-            'Sketch.Sketch.Graphics', 'Sketch.Sketch.Lib',

-            'Sketch.Sketch.Plugin', 'Sketch.Sketch.UI']

+packages = ["Sketch", 'Sketch.Base', 'Sketch.Editor',

+            'Sketch.Graphics', 'Sketch.Lib',

+            'Sketch.Plugin', 'Sketch.UI']



 version = file("Sketch/VERSION").read().strip()



-package_dir = {'Sketch': ''}

-

 ext_modules=[

-    Extension("Sketch.Sketch.Modules._type1", [mod_dir+"_type1module.c"]),

-

-    Extension("Sketch.streamfilter",

-                    [filter_dir+filename for filename in ("streamfilter.c",

-                    "filterobj.c", "linefilter.c", "subfilefilter.c",

-                    "base64filter.c", "nullfilter.c", "stringfilter.c",

-                    "binfile.c", "hexfilter.c")]),

+    Extension("Sketch.Modules._type1", [mod_dir+"_type1module.c"]),



-    Extension("Sketch.Sketch.Modules._sketch",

+    Extension("Sketch.Modules._sketch",

                     [mod_dir+filename for filename in ("_sketchmodule.c",

                     "skpoint.c", "sktrafo.c", "skrect.c", "skfm.c",

                     "curvefunc.c", "curveobject.c", "curvelow.c",

@@ -51,17 +43,17 @@

                     "skcolor.c")], include_dirs=[pil_dir],

                     libraries=libraries, library_dirs=libdirs),



-    Extension("Sketch.Sketch.Modules.skread", [mod_dir+"skreadmodule.c"]),

+    Extension("Sketch.Modules.skread", [mod_dir+"skreadmodule.c"]),



-    Extension("Sketch.Sketch.Modules.pstokenize", [mod_dir+"pstokenize.c"],

+    Extension("Sketch.Modules.pstokenize", [mod_dir+"pstokenize.c"],

                     include_dirs=[filter_dir]),



 # Remove comments to enable Libart

-#    Extension("Sketch.Sketch.Modules._libart", [mod_dir+"_libartmodule.c",

+#    Extension("Sketch.Modules._libart", [mod_dir+"_libartmodule.c",

 #                    mod_dir+"skrender.c"], library_dirs=libdirs,

 #                    libraries=libraries, include_dirs=gtk_dirs+[pil_dir]),



-    Extension("Sketch.Sketch.Modules._skgtk",

+    Extension("Sketch.Modules._skgtk",

                     [mod_dir+filename for filename in ("_skgtkmodule.c",

                     "regionobject.c", "imageobject.c", "clipmask.c",

                     "skvisual.c", "skgtkimage.c", "skdither.c",

@@ -70,6 +62,13 @@

                     define_macros=[('NO_LIBART', None)],

                     libraries=libraries, library_dirs=libdirs)]



+filter_globals = {}

+execfile(os.path.join("Filter", "setup.py"), filter_globals)

+define_filter_extensions = filter_globals["define_extensions"]

+ext_modules.extend(define_filter_extensions(0, dir_prefix = "Filter/",

+                                           module_prefix = "Filter."))

+

+



 datafile_basedir="Lib/site-packages/Sketch"



@@ -78,7 +77,7 @@

 datafile_filters = ["sketch.py", "Plugins/*/*.py", "Sketch/VERSION",

                     "Sketch/Pixmaps/*.xbm", "Sketch/Pixmaps/*.xpm",

                     "Resources/Fontmetrics/*.afm",

-                    "Resources/Fontmetrics/*.sdf", "Resources/Misc/*"]

+                    "Resources/Fontmetrics/*.sfd", "Resources/Misc/*"]



 for filter in datafile_filters:

     files = glob.glob(filter)

@@ -88,8 +87,20 @@

         dir = os.path.dirname(file)

         data_files.append((os.path.join(datafile_basedir, dir), [file]))



-scripts=["win32/sketch_postinstall.py"]

+scripts=["w32/sketch_postinstall.py"]

+

+long_description = """

+Sketch is an interactive vector drawing program

+"""

+

+setup(name = "Sketch",

+      version = "2003-11-26",

+      description = "Vector drawing program",

+      long_description = long_description,

+      license = "LGPL",

+      author = "Bernhard Herzog",

+      author_email = "address@hidden",

+      url = "http://sketch.sourceforge.net/";,



-setup(name = "Sketch", packages=packages, ext_modules=ext_modules,

-      version=version, package_dir=package_dir, data_files=data_files,

-      scripts=scripts)

+      packages=packages, ext_modules=ext_modules, data_files=data_files,

+      scripts=scripts, extra_path="Sketch")













For detailed info, follow this link:
<http://savannah.nongnu.org/patch/?func=detailitem&amp;item_id=2356>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.nongnu.org/