File makeinstall.patch of Package HeeksCAD

Overview Repositories Revisions Requests Users Attributes Meta

File makeinstall.patch of Package HeeksCAD (Revision fdc85cc05ab31f925b23b6b2d32e429c)

Currently displaying revision fdc85cc05ab31f925b23b6b2d32e429c , Show latest

diff -uNr old-heekscad/interface/ToolImage.cpp heekscad/interface/ToolImage.cpp
--- old-heekscad/interface/ToolImage.cpp	2009-05-03 00:32:04.000000000 +0200
+++ heekscad/interface/ToolImage.cpp	2009-05-03 15:56:10.000000000 +0200
@@ -10,9 +10,9 @@
 const int ToolImage::full_size = 96;
 const int ToolImage::default_bitmap_size = 24;
 
-ToolImage::ToolImage(const wxString& name):wxImage(wxGetApp().GetExeFolder() + _T("/bitmaps/") + name + _T(".png"), wxBITMAP_TYPE_PNG)
+ToolImage::ToolImage(const wxString& name):wxImage(wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/bitmaps/") + name + _T(".png"), wxBITMAP_TYPE_PNG)
 #else
-ToolImage::ToolImage(const wxString& name):wxImage(theApp.GetDllFolder() + _T("/bitmaps/") + name + _T(".png"), wxBITMAP_TYPE_PNG)
+ToolImage::ToolImage(const wxString& name):wxImage(theApp.GetDllFolder() + _T("/../share/HeeksCAD/bitmaps/") + name + _T(".png"), wxBITMAP_TYPE_PNG)
 #endif
 {
 	int width = GetWidth();
diff -uNr old-heekscad/src/Cone.h heekscad/src/Cone.h
--- old-heekscad/src/Cone.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Cone.h	2009-05-03 16:25:49.000000000 +0200
@@ -24,7 +24,7 @@
 
 	// HeeksObj's virtual functions
 	const wxChar* GetTypeString(void)const{return _("Cone");}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/cone");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/cone");}
 	void glCommands(bool select, bool marked, bool no_color);
 	HeeksObj *MakeACopy(void)const;
 	bool ModifyByMatrix(const double* m);
diff -uNr old-heekscad/src/CoordinateSystem.h heekscad/src/CoordinateSystem.h
--- old-heekscad/src/CoordinateSystem.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/CoordinateSystem.h	2009-05-03 16:29:47.000000000 +0200
@@ -39,7 +39,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Coordinate System");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/coordsys");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/coordsys");}
 	bool ModifyByMatrix(const double *mat);
 	void GetProperties(std::list<Property *> *list);
 	void GetGripperPositions(std::list<double> *list, bool just_for_endof){}
diff -uNr old-heekscad/src/Cuboid.h heekscad/src/Cuboid.h
--- old-heekscad/src/Cuboid.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Cuboid.h	2009-05-03 16:06:10.000000000 +0200
@@ -21,7 +21,7 @@
 
 	// HeeksObj's virtual functions
 	const wxChar* GetTypeString(void)const{return _("Cuboid");}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/cube");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/cube");}
 	HeeksObj *MakeACopy(void)const;
 	bool ModifyByMatrix(const double* m);
 	void GetProperties(std::list<Property *> *list);
diff -uNr old-heekscad/src/Cylinder.h heekscad/src/Cylinder.h
--- old-heekscad/src/Cylinder.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Cylinder.h	2009-05-03 16:08:59.000000000 +0200
@@ -20,7 +20,7 @@
 
 	// HeeksObj's virtual functions
 	const wxChar* GetTypeString(void)const{return _("Cylinder");}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/cyl");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/cyl");}
 	HeeksObj *MakeACopy(void)const;
 	bool ModifyByMatrix(const double* m);
 	void GetProperties(std::list<Property *> *list);
diff -uNr old-heekscad/src/Edge.h heekscad/src/Edge.h
--- old-heekscad/src/Edge.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Edge.h	2009-05-03 16:24:47.000000000 +0200
@@ -44,7 +44,7 @@
 	void GetBox(CBox &box);
 	void GetGripperPositions(std::list<double> *list, bool just_for_endof);
 	HeeksObj *MakeACopy(void)const{ return new CEdge(*this);}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/edge");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/edge");}
 	const wxChar* GetTypeString(void)const{return _("Edge");}
 	void GetTools(std::list<Tool*>* t_list, const wxPoint* p);
 	void WriteXML(TiXmlNode *root);
diff -uNr old-heekscad/src/Face.h heekscad/src/Face.h
--- old-heekscad/src/Face.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Face.h	2009-05-03 16:03:24.000000000 +0200
@@ -40,7 +40,7 @@
 	long GetMarkingMask()const{return MARKING_FILTER_FACE;}
 	void glCommands(bool select, bool marked, bool no_color);
 	void GetBox(CBox &box);
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/face");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/face");}
 	HeeksObj *MakeACopy(void)const{ return new CFace(*this);}
 	const wxChar* GetTypeString(void)const{return _("Face");}
 	void GetTriangles(void(*callbackfunc)(const double* x, const double* n), double cusp, bool just_one_average_normal = true);
diff -uNr old-heekscad/src/Group.h heekscad/src/Group.h
--- old-heekscad/src/Group.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Group.h	2009-05-03 16:04:18.000000000 +0200
@@ -13,7 +13,7 @@
 	const wxChar* GetTypeString(void)const{return _("Group");}
 	int GetType()const{return GroupType;}
 	HeeksObj *MakeACopy(void)const{ return new CGroup(*this);}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/group");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/group");}
 	void WriteXML(TiXmlNode *root);
 
 	static void MoveSolidsToGroupsById(HeeksObj* object);
diff -uNr old-heekscad/src/HArc.h heekscad/src/HArc.h
--- old-heekscad/src/HArc.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HArc.h	2009-05-03 16:04:44.000000000 +0200
@@ -32,7 +32,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Arc");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/arc");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/arc");}
 	bool ModifyByMatrix(const double *mat);
 	void SetColor(const HeeksColor &col){color = col;}
 	const HeeksColor* GetColor()const{return &color;}
diff -uNr old-heekscad/src/HCircle.h heekscad/src/HCircle.h
--- old-heekscad/src/HCircle.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HCircle.h	2009-05-03 16:24:02.000000000 +0200
@@ -29,7 +29,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Circle");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/circle");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/circle");}
 	bool ModifyByMatrix(const double *mat);
 	void SetColor(const HeeksColor &col){color = col;}
 	const HeeksColor* GetColor()const{return &color;}
diff -uNr old-heekscad/src/HDimension.h heekscad/src/HDimension.h
--- old-heekscad/src/HDimension.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HDimension.h	2009-05-03 16:05:36.000000000 +0200
@@ -41,7 +41,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Dimension");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/dimension");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/dimension");}
 	bool ModifyByMatrix(const double *mat);
 	void SetColor(const HeeksColor &col){m_color = col;}
 	const HeeksColor* GetColor()const{return &m_color;}
diff -uNr old-heekscad/src/HEllipse.h heekscad/src/HEllipse.h
--- old-heekscad/src/HEllipse.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HEllipse.h	2009-05-03 16:26:23.000000000 +0200
@@ -31,7 +31,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Ellipse");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/circle");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/circle");}
 	bool ModifyByMatrix(const double *mat);
 	void SetColor(const HeeksColor &col){color = col;}
 	const HeeksColor* GetColor()const{return &color;}
diff -uNr old-heekscad/src/HILine.h heekscad/src/HILine.h
--- old-heekscad/src/HILine.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HILine.h	2009-05-03 16:28:55.000000000 +0200
@@ -28,7 +28,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Infinite Line");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/iline");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/iline");}
 	bool ModifyByMatrix(const double *mat);
 	void SetColor(const HeeksColor &col){color = col;}
 	const HeeksColor* GetColor()const{return &color;}
diff -uNr old-heekscad/src/HImage.h heekscad/src/HImage.h
--- old-heekscad/src/HImage.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HImage.h	2009-05-03 16:08:30.000000000 +0200
@@ -38,7 +38,7 @@
 	long GetMarkingMask()const{return MARKING_FILTER_IMAGE;}
 	void glCommands(bool select, bool marked, bool no_color);
 	void GetBox(CBox &box);
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/picture");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/picture");}
 	const wxChar* GetShortString(void)const;
 	const wxChar* GetTypeString(void)const{return _("Image");}
 	HeeksObj *MakeACopy(void)const;
diff -uNr old-heekscad/src/HLine.h heekscad/src/HLine.h
--- old-heekscad/src/HLine.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HLine.h	2009-05-03 16:29:10.000000000 +0200
@@ -29,7 +29,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Line");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/line");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/line");}
 	bool ModifyByMatrix(const double *mat);
 	void SetColor(const HeeksColor &col){color = col;}
 	const HeeksColor* GetColor()const{return &color;}
diff -uNr old-heekscad/src/HPoint.h heekscad/src/HPoint.h
--- old-heekscad/src/HPoint.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HPoint.h	2009-05-03 16:05:54.000000000 +0200
@@ -28,7 +28,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Point");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/point");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/point");}
 	bool ModifyByMatrix(const double *mat);
 	void SetColor(const HeeksColor &col){color = col;}
 	const HeeksColor* GetColor()const{return &color;}
diff -uNr old-heekscad/src/HSpline.h heekscad/src/HSpline.h
--- old-heekscad/src/HSpline.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HSpline.h	2009-05-03 16:26:43.000000000 +0200
@@ -31,7 +31,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Spline");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/circle");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/circle");}
 	bool ModifyByMatrix(const double *mat);
 	void SetColor(const HeeksColor &col){color = col;}
 	const HeeksColor* GetColor()const{return &color;}
diff -uNr old-heekscad/src/HText.h heekscad/src/HText.h
--- old-heekscad/src/HText.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HText.h	2009-05-03 16:25:11.000000000 +0200
@@ -30,7 +30,7 @@
 	void GetBox(CBox &box);
 	const wxChar* GetTypeString(void)const{return _("Text");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/text");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/text");}
 	bool ModifyByMatrix(const double *mat);
 	void SetColor(const HeeksColor &col){m_color = col;}
 	const HeeksColor* GetColor()const{return &m_color;}
diff -uNr old-heekscad/src/HXml.h heekscad/src/HXml.h
--- old-heekscad/src/HXml.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/HXml.h	2009-05-03 16:08:13.000000000 +0200
@@ -22,7 +22,7 @@
 	const wxChar* GetShortString(void)const;
 	const wxChar* GetTypeString(void)const{return _("Xml");}
 	HeeksObj *MakeACopy(void)const;
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/xml");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/xml");}
 	void GetProperties(std::list<Property *> *list);
 	void CopyFrom(const HeeksObj* object){operator=(*((HXml*)object));}
 	void WriteXML(TiXmlNode *root);
diff -uNr old-heekscad/src/Makefile heekscad/src/Makefile
--- old-heekscad/src/Makefile	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Makefile	2009-05-03 16:00:26.000000000 +0200
@@ -1,3 +1,7 @@
+PREFIX=/usr
+BINDIR=$(PREFIX)/bin
+DATADIR=$(PREFIX)/share
+
 WXCFLAGS=$(shell wx-config --cflags)
 
 # dan heeks uncomments the next line to make it work for him on his Inspiron 530
@@ -313,4 +317,11 @@
 clean:
 	-rm ${EXECUTABLE} ${OBJECTS}
 
-
+install:
+	mkdir -p $(DESTDIR)/$(BINDIR)
+	mkdir -p $(DESTDIR)/$(DATADIR)/HeeksCAD
+	cp $(EXECUTABLE) $(DESTDIR)/$(BINDIR)/
+	cp -R ../icons $(DESTDIR)/$(DATADIR)/HeeksCAD/
+	rm -rf $(DESTDIR)/$(DATADIR)/HeeksCAD/icons/.svn
+	cp -R ../bitmaps $(DESTDIR)/$(DATADIR)/HeeksCAD/
+	rm -rf $(DESTDIR)/$(DATADIR)/HeeksCAD/bitmaps/.svn
diff -uNr old-heekscad/src/Shape.h heekscad/src/Shape.h
--- old-heekscad/src/Shape.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Shape.h	2009-05-03 16:24:26.000000000 +0200
@@ -16,7 +16,7 @@
 public:
 	const wxChar* GetTypeString(void)const{return _("Faces");}
 	HeeksObj *MakeACopy(void)const{ return new CFaceList(*this);}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/faces");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/faces");}
 };
 
 class CEdgeList: public ObjList{
@@ -24,7 +24,7 @@
 public:
 	const wxChar* GetTypeString(void)const{return _("Edges");}
 	HeeksObj *MakeACopy(void)const{ return new CEdgeList(*this);}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/edges");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/edges");}
 };
 
 class CShape:public ObjList{
diff -uNr old-heekscad/src/Sketch.h heekscad/src/Sketch.h
--- old-heekscad/src/Sketch.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Sketch.h	2009-05-03 16:29:27.000000000 +0200
@@ -32,7 +32,7 @@
 	int GetType()const{return SketchType;}
 	long GetMarkingMask()const{return MARKING_FILTER_SKETCH;}
 	const wxChar* GetTypeString(void)const{return _("Sketch");}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/linedrawing");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/linedrawing");}
 	void GetProperties(std::list<Property *> *list);
 	void GetTools(std::list<Tool*>* t_list, const wxPoint* p);
 	HeeksObj *MakeACopy(void)const;
diff -uNr old-heekscad/src/Solid.h heekscad/src/Solid.h
--- old-heekscad/src/Solid.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Solid.h	2009-05-03 16:06:29.000000000 +0200
@@ -23,7 +23,7 @@
 	int GetType()const{return SolidType;}
 	long GetMarkingMask()const{return MARKING_FILTER_SOLID;}
 	const wxChar* GetTypeString(void)const{return _("Solid");}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/solid");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/solid");}
 	HeeksObj *MakeACopy(void)const;
 	void SetColor(const HeeksColor &col){m_color = col;}
 	const HeeksColor* GetColor()const{return &m_color;}
diff -uNr old-heekscad/src/Sphere.h heekscad/src/Sphere.h
--- old-heekscad/src/Sphere.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Sphere.h	2009-05-03 16:04:04.000000000 +0200
@@ -19,7 +19,7 @@
 
 	// HeeksObj's virtual functions
 	const wxChar* GetTypeString(void)const{return _("Sphere");}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/sphere");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/sphere");}
 	HeeksObj *MakeACopy(void)const;
 	bool ModifyByMatrix(const double* m);
 	void GetProperties(std::list<Property *> *list);
diff -uNr old-heekscad/src/StlSolid.h heekscad/src/StlSolid.h
--- old-heekscad/src/StlSolid.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/StlSolid.h	2009-05-03 16:26:07.000000000 +0200
@@ -36,7 +36,7 @@
 	long GetMarkingMask()const{return MARKING_FILTER_STL_SOLID;}
 	int GetIDGroupType()const{return SolidType;}
 	const wxChar* GetTypeString(void)const{return _("STL Solid");}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/stlsolid");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/stlsolid");}
 	void glCommands(bool select, bool marked, bool no_color);
 	void GetBox(CBox &box);
 	void KillGLLists(void);
diff -uNr old-heekscad/src/Wire.h heekscad/src/Wire.h
--- old-heekscad/src/Wire.h	2009-05-03 00:32:12.000000000 +0200
+++ heekscad/src/Wire.h	2009-05-03 16:27:05.000000000 +0200
@@ -17,7 +17,7 @@
 	long GetMarkingMask()const{return MARKING_FILTER_WIRE;}
 	const wxChar* GetTypeString(void)const{return _("Wire");}
 	HeeksObj *MakeACopy(void)const{ return new CWire(*this);}
-	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/icons/wire");}
+	wxString GetIcon(){return wxGetApp().GetExeFolder() + _T("/../share/HeeksCAD/icons/wire");}
 	void GetTools(std::list<Tool*>* t_list, const wxPoint* p);
 
 	const TopoDS_Wire &Wire()const;

Places

File makeinstall.patch of Package HeeksCAD (Revision fdc85cc05ab31f925b23b6b2d32e429c)

Places