Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
Education
HeeksCNC
makeinstall.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File makeinstall.patch of Package HeeksCNC
diff -uNr old-heekscnc/src/Adaptive.h heekscnc/src/Adaptive.h --- old-heekscnc/src/Adaptive.h 2009-05-03 16:52:57.000000000 +0200 +++ heekscnc/src/Adaptive.h 2009-05-03 16:58:02.000000000 +0200 @@ -64,7 +64,7 @@ int GetType()const{return AdaptiveType;} const wxChar* GetTypeString(void)const{return _T("Adaptive Roughing");} void glCommands(bool select, bool marked, bool no_color); - wxString GetIcon(){if(m_active)return theApp.GetDllFolder() + _T("/icons/adapt"); else return COp::GetIcon();} + wxString GetIcon(){if(m_active)return theApp.GetDllFolder() + _T("/../share/HeeksCAD/icons/adapt"); else return COp::GetIcon();} void GetProperties(std::list<Property *> *list); HeeksObj *MakeACopy(void)const; void CopyFrom(const HeeksObj* object); diff -uNr old-heekscnc/src/Makefile heekscnc/src/Makefile --- old-heekscnc/src/Makefile 2009-05-03 16:52:57.000000000 +0200 +++ heekscnc/src/Makefile 2009-05-03 17:11:40.000000000 +0200 @@ -1,12 +1,17 @@ +PREFIX=/usr +BINDIR=$(PREFIX)/bin +DATADIR=$(PREFIX)/share +LIBDIR=$(PREFIX)/$(LIB) + WXCFLAGS=$(shell wx-config --cflags) # dan heeks uncomments the next line to make it work for him on his Inspiron 530 #WXCFLAGS=-I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -#check the environment variable HEEKSCADPATH. If it's not set, print a message and assume ../.. +#check the environment variable HEEKSCADPATH. If it's not set, print a message and assume default include dir /usr/include/HeeksCAD ifeq ($(strip $(HEEKSCADPATH)),) heekspathmessage = message - HEEKSCADPATH = ../.. + HEEKSCADPATH = /usr/include/HeeksCAD else heekspathmessage = endif @@ -28,7 +33,7 @@ #print a message if HEEKSCADPATH is not set #use escape sequences for colors. Z gets translated to \033 message: - @echo Z[1mEnvironment variable HEEKSCADPATH not set. Assuming Z[32m../..Z[37mZ[0m | tr Z '\033' + @echo Z[1mEnvironment variable HEEKSCADPATH not set. Assuming Z[32m/usr/include/HeeksCADZ[37mZ[0m | tr Z '\033' HeeksCNC.o: HeeksCNC.cpp gcc -c $? ${CCFLAGS} -o $@ @@ -129,4 +134,14 @@ clean: -rm ${SHARED_LIBRARY} ${OBJECTS} - +install: + mkdir -p $(DESTDIR)/$(DATADIR)/HeeksCAD/bitmaps/ + mkdir -p $(DESTDIR)/$(DATADIR)/HeeksCAD/icons + mkdir -p $(DESTDIR)/$(DATADIR)/HeeksCAD/nc + mkdir -p $(DESTDIR)/$(LIBDIR) + cp $(SHARED_LIBRARY) $(DESTDIR)/$(LIBDIR)/ + cp -R ../bitmaps/*.png $(DESTDIR)/$(DATADIR)/HeeksCAD/bitmaps/ + cp -R ../bitmaps/*.svg $(DESTDIR)/$(DATADIR)/HeeksCAD/bitmaps/ + cp -R ../bitmaps/*.png $(DESTDIR)/$(DATADIR)/HeeksCAD/bitmaps/ + cp -R ../icons/*.png $(DESTDIR)/$(DATADIR)/HeeksCAD/icons/ + cp -R ../nc/*.py $(DESTDIR)/$(DATADIR)/HeeksCAD/nc diff -uNr old-heekscnc/src/NCCode.h heekscnc/src/NCCode.h --- old-heekscnc/src/NCCode.h 2009-05-03 16:52:57.000000000 +0200 +++ heekscnc/src/NCCode.h 2009-05-03 16:57:25.000000000 +0200 @@ -151,7 +151,7 @@ const wxChar* GetTypeString(void)const{return _T("NC Code");} void glCommands(bool select, bool marked, bool no_color); void GetBox(CBox &box); - wxString GetIcon(){return theApp.GetDllFolder() + _T("/icons/nccode");} + wxString GetIcon(){return theApp.GetDllFolder() + _T("/../share/HeeksCAD/icons/nccode");} void GetProperties(std::list<Property *> *list); void GetTools(std::list<Tool*>* t_list, const wxPoint* p); HeeksObj *MakeACopy(void)const; diff -uNr old-heekscnc/src/Op.h heekscnc/src/Op.h --- old-heekscnc/src/Op.h 2009-05-03 16:52:57.000000000 +0200 +++ heekscnc/src/Op.h 2009-05-03 16:58:42.000000000 +0200 @@ -22,7 +22,7 @@ void GetProperties(std::list<Property *> *list); void WriteBaseXML(TiXmlElement *element); void ReadBaseXML(TiXmlElement* element); - wxString GetIcon(){return theApp.GetDllFolder() + _T("/icons/noentry");} + wxString GetIcon(){return theApp.GetDllFolder() + _T("/../share/HeeksCAD/icons/noentry");} virtual void AppendTextToProgram(); diff -uNr old-heekscnc/src/Pocket.h heekscnc/src/Pocket.h --- old-heekscnc/src/Pocket.h 2009-05-03 16:52:57.000000000 +0200 +++ heekscnc/src/Pocket.h 2009-05-03 16:57:44.000000000 +0200 @@ -38,7 +38,7 @@ int GetType()const{return PocketType;} const wxChar* GetTypeString(void)const{return _T("Pocket");} void glCommands(bool select, bool marked, bool no_color); - wxString GetIcon(){if(m_active)return theApp.GetDllFolder() + _T("/icons/pocket"); else return CDepthOp::GetIcon();} + wxString GetIcon(){if(m_active)return theApp.GetDllFolder() + _T("/../share/HeeksCAD/icons/pocket"); else return CDepthOp::GetIcon();} void GetProperties(std::list<Property *> *list); HeeksObj *MakeACopy(void)const; void CopyFrom(const HeeksObj* object); diff -uNr old-heekscnc/src/Profile.h heekscnc/src/Profile.h --- old-heekscnc/src/Profile.h 2009-05-03 16:52:57.000000000 +0200 +++ heekscnc/src/Profile.h 2009-05-03 16:56:57.000000000 +0200 @@ -45,7 +45,7 @@ int GetType()const{return ProfileType;} const wxChar* GetTypeString(void)const{return _T("Profile");} void glCommands(bool select, bool marked, bool no_color); - wxString GetIcon(){if(m_active)return theApp.GetDllFolder() + _T("/icons/profile"); else return CDepthOp::GetIcon();} + wxString GetIcon(){if(m_active)return theApp.GetDllFolder() + _T("/../share/HeeksCAD/icons/profile"); else return CDepthOp::GetIcon();} void GetProperties(std::list<Property *> *list); void GetTools(std::list<Tool*>* t_list, const wxPoint* p); HeeksObj *MakeACopy(void)const; diff -uNr old-heekscnc/src/Program.h heekscnc/src/Program.h --- old-heekscnc/src/Program.h 2009-05-03 16:52:57.000000000 +0200 +++ heekscnc/src/Program.h 2009-05-03 16:58:30.000000000 +0200 @@ -17,7 +17,7 @@ int GetType()const{return OperationsType;} const wxChar* GetTypeString(void)const{return _("Operations");} HeeksObj *MakeACopy(void)const{ return new COperations(*this);} - wxString GetIcon(){return theApp.GetDllFolder() + _T("/icons/operations");} + wxString GetIcon(){return theApp.GetDllFolder() + _T("/../share/HeeksCAD/icons/operations");} bool CanAddTo(HeeksObj* owner){return owner->GetType() == ProgramType;} bool CanAdd(HeeksObj* object); bool CanBeRemoved(){return false;} @@ -50,7 +50,7 @@ // HeeksObj's virtual functions int GetType()const{return ProgramType;} const wxChar* GetTypeString(void)const{return _T("Program");} - wxString GetIcon(){return theApp.GetDllFolder() + _T("/icons/program");} + wxString GetIcon(){return theApp.GetDllFolder() + _T("/../share/HeeksCAD/icons/program");} HeeksObj *MakeACopy(void)const; void CopyFrom(const HeeksObj* object); void GetProperties(std::list<Property *> *list); @@ -68,4 +68,4 @@ void RewritePythonProgram(); ProgramUserType GetUserType(); void UpdateFromUserType(); -}; +}; diff -uNr old-heekscnc/src/PythonStuff.cpp heekscnc/src/PythonStuff.cpp --- old-heekscnc/src/PythonStuff.cpp 2009-05-03 16:52:57.000000000 +0200 +++ heekscnc/src/PythonStuff.cpp 2009-05-03 17:10:15.000000000 +0200 @@ -67,7 +67,7 @@ #ifdef WIN32 Execute(wxString(_T("\"")) + theApp.GetDllFolder() + _T("/nc_read.bat\" iso \"") + m_filename + _T("\"")); #else - Execute(wxString(_T("python \"")) + theApp.GetDllFolder() + wxString(_T("/nc/iso_read.py\" ")) + m_filename); + Execute(wxString(_T("python \"")) + theApp.GetDllFolder() + wxString(_T("/../share/HeeksCAD/nc/iso_read.py\" ")) + m_filename); #endif } void ThenDo(void) @@ -110,7 +110,7 @@ #ifdef WIN32 Execute(theApp.GetDllFolder() + wxString(_T("/post.bat"))); #else - Execute(wxString(_T("python ")) + theApp.GetDllFolder() + wxString(_T("/post.py"))); + Execute(wxString(_T("python ")) + theApp.GetDllFolder() + wxString(_T("/../share/HeeksCAD/post.py"))); #endif } void ThenDo(void) { (new CPyBackPlot(m_filename))->Do(); } @@ -136,7 +136,7 @@ theApp.m_output_canvas->m_textCtrl->Clear(); // clear the output window // write the python file - wxString file_str = theApp.GetDllFolder() + wxString(_T("/post.py")); + wxString file_str = theApp.GetDllFolder() + wxString(_T("/../share/HeeksCAD/post.py")); if(!write_python_file(file_str)) { wxMessageBox(_T("couldn't write post.py!")); diff -uNr old-heekscnc/src/ZigZag.h heekscnc/src/ZigZag.h --- old-heekscnc/src/ZigZag.h 2009-05-03 16:52:57.000000000 +0200 +++ heekscnc/src/ZigZag.h 2009-05-03 16:56:38.000000000 +0200 @@ -45,7 +45,7 @@ int GetType()const{return ZigZagType;} const wxChar* GetTypeString(void)const{return _T("ZigZag");} void glCommands(bool select, bool marked, bool no_color); - wxString GetIcon(){if(m_active)return theApp.GetDllFolder() + _T("/icons/zigzag"); else return COp::GetIcon();} + wxString GetIcon(){if(m_active)return theApp.GetDllFolder() + _T("/../share/HeeksCAD/icons/zigzag"); else return COp::GetIcon();} void GetProperties(std::list<Property *> *list); HeeksObj *MakeACopy(void)const; void CopyFrom(const HeeksObj* object);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
