merged r1088-r1093

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@1096 bbaffbd6-741e-11dd-a85d-61de82d9cad9

Changelog

@@ -1,10 +1,11 @@
-Version 0.5.1 - UNRELEASED
+Version 0.5.1 - 2011-06-13
  * added extrusion for 2D models
  * 2D projection of multi-layered 2D models
  * significantly improved performance of 3D visualization
  * fixed "help" links for Windows users
  * added GTK theme with a native look&feel for Windows
  * improved detection of library locations for Windows package
+ * added file type associations (mime) to the debian package
  * minor bugs fixed
 
 Version 0.5 - 2011-03-28

MANIFEST.in

@@ -8,7 +8,7 @@ include release_info.txt
 include pycam
 recursive-include desktop *
 recursive-include man *
-recursive-include src *
+recursive-include src *.py
 recursive-include share *
 recursive-include samples *
 recursive-include Tests *

debian/changelog

@@ -1,35 +1,7 @@
-pycam (0.4-2) unstable; urgency=low
+pycam (0.5.1-1) unstable; urgency=low
 
-  * Improved the packaging based on suggestions by Benoît Knecht:
-   * Changed the copyright file to the format specified by DEP5
-   * Removed postinst and prerm placeholders
-   * Added descriptions to the patches
-   * Added a watch file
+  * initial debian package
+  * Closes: #600779
 
- -- Lars Kruse <[email protected]>  Sun, 14 Nov 2010 15:46:01 +0100
+ -- Lars Kruse <[email protected]>  Mon, 13 Jun 2011 02:04:59 +0200
 
-pycam (0.4-1) unstable; urgency=low
-
-  * new upstream release
-
- -- Lars Kruse <[email protected]>  Tue, 19 Oct 2010 12:11:27 +0200
-
-pycam (0.3-1) unstable; urgency=low
-
-  * new upstream release
-  * Switch to dpkg-source 3.0 (quilt) format
-  * Updated policy to 3.9.1 (no changes)
-
- -- Lars Kruse <[email protected]>  Mon, 16 Aug 2010 15:57:45 +0200
-
-pycam (0.2.3-1) unstable; urgency=low
-
-  * new upstream release
-
- -- Lars Kruse <[email protected]>  Mon, 05 Apr 2010 02:48:36 +0200
-
-pycam (0.2.2-1) unstable; urgency=low
-
-  * Initial debianization of r243 of the SVN repo on sourceforge
-
- -- Sebastian Kuzminsky <[email protected]>  Tue, 16 Mar 2010 22:14:56 -0600

debian/control

@@ -4,26 +4,28 @@ Priority: extra
 Maintainer: Lars Kruse <[email protected]>
 Build-Depends: python, debhelper (>= 7), cdbs, patchutils
 Build-Depends-Indep: python-support, help2man
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://sourceforge.net/projects/pycam/
 
 Package: pycam
 Architecture: all
 Depends: python-gtk2, python-opengl (>>3.0.0~b6-3), python-gtkglext1,
  ${misc:Depends}, ${python:Depends}
 Recommends: python-pyode (>>1.2.0-3), python-psyco, python-setproctitle
-Description: CAM program & library written in Python
- This is a set of Python modules for toolpath generation for 3-Axis
- CNC machining, and a GUI program that uses them.
+Suggests: inkscape, pstoedit, qcad-data
+Description: CAM program & Python library for generating toolpaths
+ PyCAM is a toolpath generator for 3 axis machines. The generated
+ GCode can be used with EMC2 and other machine controllers.
+ The included Python library can be used independently from the GUI.
  .
  Features:
-    * read and write STL model files
-    * limited support for 2D models (SVG or DXF)
-    * generate and export toolpaths (gcode) for various strategies and
-      drill definitions
-    * manage processing templates (e.g. rough, semi-finish and finish
-      operations)
+    * read and write STL model files (3D)
+    * support for 2D models (DXF/SVG/PS)
+    * generate toolpaths (GCode) for various strategies and drill
+	  definitions
+    * manage and store processing templates
     * scale, move, rotate, flip and transform the model
-    * interactive 3D model view
+    * interactive 3D model view based on OpenGL
     * non-interactive generation of GCode via commandline
+	* render single-line fonts (provided by QCAD)
 

debian/copyright

@@ -4,12 +4,12 @@ Maintainer: Lars Kruse <[email protected]>
 Source: http://pycam.sourceforge.net
 
 Files: *
-Copyright: 2010, Lars Kruse <[email protected]>
+Copyright: 2010-2011, Lars Kruse <[email protected]>
            2006-2010, Lode Leroy
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2010, Lars Kruse <[email protected]>
+Copyright: 2010-2011, Lars Kruse <[email protected]>
            2010, Sebastian Kuzminsky <[email protected]>
 License: GPL-3+
 

debian/dirs

@@ -1 +1,2 @@
 usr/share/applications
+usr/share/icons/hicolor/scalable/apps

debian/docs

@@ -1,4 +1,3 @@
-Changelog
 technical_details.txt
 README.TXT
 

debian/patches/series

@@ -1,2 +0,0 @@
-00.remove_windows_install_script.patch
-01.remove-superfluous-files-from-doc.patch

debian/pycam.mime

@@ -0,0 +1 @@
+../share/mime/pycam.mime

debian/pycam.sharedmimeinfo

@@ -0,0 +1 @@
+../share/mime/pycam.xml

debian/rules

@@ -27,6 +27,14 @@ build/pycam::
 
 # install the .desktop file
 install/pycam::
-	cp -v desktop/pycam.desktop `pwd`/debian/pycam/usr/share/applications/
+	# "desktop" file
+	cp -v share/desktop/pycam.desktop `pwd`/debian/pycam/usr/share/applications/
+	# application logo for the menu entry
+	cp -v share/ui/logo_scalable.svg `pwd`/debian/pycam/usr/share/icons/hicolor/scalable/apps/pycam.svg
+	# remove "doc" directory from /usr/share/pycam/
 	rm -rf `pwd`/debian/pycam/usr/share/pycam/doc
+	# the CXF fonts are distributed by QCAD - use them instead of the embedded ones
+	rm -rf `pwd`/debian/pycam/usr/share/pycam/fonts
+	# the gtkrc file for Windows is useless
+	rm `pwd`/debian/pycam/usr/share/pycam/ui/gtkrc_windows
 

pycam

@@ -95,6 +95,7 @@ log = pycam.Utils.log.get_logger()
 EXAMPLE_MODEL_LOCATIONS = [
         os.path.join(BASE_DIR, "samples"),
         os.path.join(sys.prefix, "share", "pycam", "samples"),
+        os.path.join(sys.prefix, "local", "share", "pycam", "samples"),
         os.path.join("usr", "share", "pycam", "samples")]
 # for pyinstaller (windows distribution)
 if "_MEIPASS2" in os.environ:

pyinstaller/pycam.spec

@@ -9,6 +9,7 @@ from pycam.Utils import get_platform, PLATFORM_LINUX, PLATFORM_WINDOWS, PLATFORM
 from pycam import VERSION
 
 
+USE_DEBUG=False
 UI_DATA_RELATIVE = os.path.join("share", "ui")
 UI_DATA_DIR = os.path.join(BASE_DIR, UI_DATA_RELATIVE)
 ORIGINAL_STARTUP_SCRIPT = os.path.join(BASE_DIR, "pycam")
@@ -23,11 +24,8 @@ if rename_startup_script:
 else:
     STARTUP_SCRIPT = ORIGINAL_STARTUP_SCRIPT
 
-data = [(os.path.join(UI_DATA_RELATIVE, "pycam-project.ui"), os.path.join(UI_DATA_DIR, "pycam-project.ui"), "DATA"),
-        (os.path.join(UI_DATA_RELATIVE, "menubar.xml"), os.path.join(UI_DATA_DIR, "menubar.xml"), "DATA"),
-        (os.path.join(UI_DATA_RELATIVE, "logo_gui.png"), os.path.join(UI_DATA_DIR, "logo_gui.png"), "DATA"),
-        (os.path.join(UI_DATA_RELATIVE, "gtkrc_windows"), os.path.join(UI_DATA_DIR, "gtkrc_windows"), "DATA"),
-]
+data = []
+data.extend(Tree(UI_DATA_DIR, prefix=UI_DATA_RELATIVE))
 
 # sample models
 data.extend(Tree(os.path.join(BASE_DIR, "samples"), prefix="samples"))
@@ -183,10 +181,10 @@ exe = EXE(pyz,
           exclude_binaries=False,
           name=output_name,
           icon=icon_file,
-          debug=True,
+          debug=USE_DEBUG,
           strip=False,
-          upx=False,
-          console=True,
+          upx=True,
+          console=USE_DEBUG,
       )
 
 

setup.cfg

@@ -2,6 +2,9 @@
 install_script = pycam_win32_postinstall.py
 bitmap = share/ui/logo_gui_vertical.bmp
 
+[bdist_msi]
+install_script = pycam_win32_postinstall.py
+
 [bdist_rpm]
 packager = Lars Kruse <[email protected]>
 doc_files = Changelog

setup.py

@@ -37,7 +37,7 @@
 DEFAULT_START_SCRIPT = "pycam"
 
 # we don't want to include the windows postinstall script in other installers
-is_windows_installer = "bdist_wininst" in sys.argv
+is_windows_installer = "bdist_wininst" in sys.argv or "bdist_msi" in sys.argv
 
 if is_windows_installer:
     shutil.copy2(os.path.join(BASE_DIR, DEFAULT_START_SCRIPT),

share/desktop/pycam.desktop

@@ -2,8 +2,12 @@
 Version=1.0
 Name=PyCAM
 GenericName=Toolpath Generator
-Comment=Toolpath Generation for 3-Axis CNC machining
-Exec=pycam
+Comment=generate GCode for 3-Axis CNC machining
+Exec=pycam %u
+TryExec=pycam
 Terminal=false
 Type=Application
-Categories=Development;Engineering;Robotics;
+Categories=Development;Engineering;Robotics;Education;Science;2DGraphics;VectorGraphics;3DGraphics
+MimeType=application/sla;image/svg+xml;application/postscript;image/vnd.dxf
+Icon=pycam
+

share/mime/pycam.mime

@@ -1 +1,4 @@
 application/sla; pycam '%s'; description="Stereo Lithographic File"; test=test -n "$DISPLAY"; nametemplate=%s.stl
+image/vnd.dxf; pycam '%s'; description="Drawing Interchange File"; test=test -n "$DISPLAY"; nametemplate=%s.dxf
+image/svg+xml; pycam '%s'; description="Vector Graphics"; test=test -n "$DISPLAY" && which inkscape && which pstoedit; nametemplate=%s.svg
+application/postscript; pycam '%s'; description="Postscript"; test=test -n "$DISPLAY" && which pstoedit

share/mime/pycam.xml

@@ -7,5 +7,12 @@
     </magic>
     <glob pattern="*.stl"/>
   </mime-type>
+  <mime-type type="image/vnd.dxf">
+    <comment>Drawing Interchange Files (2D or 3D models)</comment>
+    <magic priority="50">
+      <match type="string" offset="0:20" value="SECTION"/>
+    </magic>
+    <glob pattern="*.dxf"/>
+  </mime-type>
 </mime-info>