Index: sketch.py =================================================================== RCS file: /cvs/gnome/sketch/sketch.py,v retrieving revision 1.9 diff -c -u -r1.9 sketch.py cvs diff: conflicting specifications of output style --- sketch.py 20 Nov 2003 14:43:59 -0000 1.9 +++ sketch.py 20 Jan 2004 17:28:20 -0000 @@ -29,7 +29,9 @@ import _winreg key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, "Software\\GTK\\2.0") gtkdir = _winreg.QueryValueEx(key, "Path")[0] - os.environ['PATH'] += ";%s/lib;%s/bin" % (gtkdir, gtkdir) + os.environ['PATH'] = "%s;%s;%s" % (os.path.join(gtkdir, "lib"), + os.path.join(gtkdir, "bin"), + os.environ['PATH']) except: pass Index: w32setup.py =================================================================== RCS file: /cvs/gnome/sketch/w32setup.py,v retrieving revision 1.2 diff -c -u -r1.2 w32setup.py cvs diff: conflicting specifications of output style --- w32setup.py 26 Nov 2003 19:56:39 -0000 1.2 +++ w32setup.py 20 Jan 2004 17:28:20 -0000 @@ -10,7 +10,7 @@ libraries = ["gtk-win32-2.0", "gdk-win32-2.0", "gmodule-2.0", "gobject-2.0", "glib-2.0" # Remove comment to enable Libart -# , "libart_lgpl" + , "libart_lgpl" ] python_dir = "C:/python23/" @@ -49,9 +49,9 @@ include_dirs=[filter_dir]), # Remove comments to enable Libart -# 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.Modules._libart", [mod_dir+"_libartmodule.c", + mod_dir+"skrender.c"], library_dirs=libdirs, + libraries=libraries, include_dirs=gtk_dirs+[pil_dir]), Extension("Sketch.Modules._skgtk", [mod_dir+filename for filename in ("_skgtkmodule.c", @@ -59,7 +59,7 @@ "skvisual.c", "skgtkimage.c", "skdither.c", "curvedraw.c")], include_dirs=gtk_dirs+[pil_dir], # Comment the following line to enable Libart - define_macros=[('NO_LIBART', None)], +# define_macros=[('NO_LIBART', None)], libraries=libraries, library_dirs=libdirs)] filter_globals = {} @@ -94,7 +94,7 @@ """ setup(name = "Sketch", - version = "2003-11-26", + version = "2004-01-12", description = "Vector drawing program", long_description = long_description, license = "LGPL", Index: w32/sketch_postinstall.py =================================================================== RCS file: /cvs/gnome/sketch/w32/sketch_postinstall.py,v retrieving revision 1.1 diff -c -u -r1.1 sketch_postinstall.py cvs diff: conflicting specifications of output style --- w32/sketch_postinstall.py 20 Nov 2003 14:43:56 -0000 1.1 +++ w32/sketch_postinstall.py 20 Jan 2004 17:28:20 -0000 @@ -1,12 +1,23 @@ import sys, os -datafile_basedir="Lib/site-packages/Sketch" +datafile_basedir="Lib\\site-packages\\Sketch" + +error_message = """\ +Cannot install Start Menu shortcuts for Skencil because of the reason +shown below. You can run Sketch easily by creating a shortcut for command +"C:\Python23\python.exe C:\Python23\Lib\site-packages\Sketch\Sketch.py". +The paths can be a bit different depending on your setup. +""" if len(sys.argv) > 1 and sys.argv[1] == "-install": try: start_menu = get_special_folder_path("CSIDL_COMMON_PROGRAMS") except OSError: # probably Win98 - start_menu = get_special_folder_path("CSIDL_PROGRAMS") + try: + start_menu = get_special_folder_path("CSIDL_PROGRAMS") + except OSError, error: + print error_message + raise sketch_dir=os.path.join(sys.prefix, datafile_basedir) sketch_py=os.path.join(sketch_dir, "Sketch.py")