TechDraw to Master

Merged, abandoned or rejected pull requests are moved here to clear the main Pull Requests forum.
User avatar
wandererfan
Posts: 3680
Joined: Tue Nov 06, 2012 5:42 pm

Re: TechDraw to Master

Postby wandererfan » Thu Jun 30, 2016 2:42 pm

:D :D :D

Code: Select all

OS: Ubuntu 12.04.5 LTS
Word size of OS: 64-bit
Word size of FreeCAD: 64-bit
Version: 0.17.7801 +95 (Git)
Build type: debug
Branch: TechDraw
Hash: 55522e4788ae9755300f3f51055429864a95de8e
Python version: 2.7.3
Qt version: 4.8.1
Coin version: 3.1.3
OCC version: 7.0.0
Passes all tests except:
MeshTestApps
TestFem

Now to get a current version of VTK(and friends) and add in Mesh/MeshPart/FEM/etc.

My steps:
- hacked OpenCASCADETargets.cmake to force tcl8.5/tk8.5
- USE_VTK=OFF
- built all 7 OCC modules

- hacked findOpenCasCade.cmake to suppress search for OCE (#find_package(OCE QUIET))
- turned off FC modules that use Mesh/MeshPart
- #include <Handle_Geom_Curve.hxx> => #include <Geom_Curve.hxx> in DrawViewPart.cpp
User avatar
sgrogan
Posts: 5651
Joined: Wed Oct 22, 2014 5:02 pm

Re: TechDraw to Master

Postby sgrogan » Thu Jun 30, 2016 2:56 pm

wandererfan wrote:Passes all tests except:
MeshTestApps
TestFem
Awesome did you push your changes?
User avatar
wandererfan
Posts: 3680
Joined: Tue Nov 06, 2012 5:42 pm

Re: TechDraw to Master

Postby wandererfan » Thu Jun 30, 2016 3:09 pm

sgrogan wrote:Awesome did you push your changes?
I pushed the change for Handle_Geom_Curve ==> Geom_Curve.

I did not push my hack of findOpenCasCade.cmake. That didn't seem to belong in master.
User avatar
sgrogan
Posts: 5651
Joined: Wed Oct 22, 2014 5:02 pm

Re: TechDraw to Master

Postby sgrogan » Thu Jun 30, 2016 3:28 pm

wandererfan wrote: I pushed the change for Handle_Geom_Curve ==> Geom_Curve.
All self tests pass :D
OS: Windows 7
Word size of OS: 64-bit
Word size of FreeCAD: 64-bit
Version: 0.17.7897 (Git)
Build type: Release
Branch: TechDraw
Hash: 0c327bfc78beba236cc864065b7f0c3e98530493
Python version: 2.7.8
Qt version: 4.8.7
Coin version: 4.0.0a
OCC version: 7.0.0
User avatar
yorik
Site Admin
Posts: 11712
Joined: Tue Feb 17, 2009 9:16 pm
Location: São Paulo, Brazil
Contact:

Re: TechDraw to Master

Postby yorik » Thu Jun 30, 2016 6:33 pm

Okay then, building here now to give it a spin, then if all works OK I'll commit! :D
blacey
Posts: 370
Joined: Tue Dec 08, 2015 11:28 pm

Re: TechDraw to Master

Postby blacey » Thu Jun 30, 2016 10:42 pm

Just tried to build TechDraw on macOS against OCCT7 but it fails with the following:

Code: Select all

blacey$ git rev-parse --short techdraw
0c327bf

blacey$ cmake -DFREECAD_USE_EXTERNAL_KDL=ON -DFREECAD_CREATE_MAC_APP=ON -DBUILD_FEM_NETGEN=ON ../

...snip, snip, snip....

blacey$ make -j4 install
Scanning dependencies of target Driver
Scanning dependencies of target MEFISTO2
Scanning dependencies of target SMDS
[  0%] Generating moc_Debugger.cpp
[  0%] Generating moc_FutureWatcherProgress.cpp
Scanning dependencies of target FreeCADBase
[  0%] Building CXX object src/3rdParty/salomesmesh/CMakeFiles/MEFISTO2.dir/src/MEFISTO2/aptrte.cpp.o
[  0%] Building CXX object src/3rdParty/salomesmesh/CMakeFiles/Driver.dir/src/Driver/Driver_Document.cpp.o
[  0%] Building C object src/3rdParty/salomesmesh/CMakeFiles/MEFISTO2.dir/src/MEFISTO2/trte.c.o

..snip, snip, snip...

-- Installing: /usr/local/FreeCAD.app/Contents/lib/Path.so
-- Installing: /usr/local/FreeCAD.app/Contents/lib/area.so
-- Installing: /usr/local/FreeCAD.app/Contents/lib/PathGui.so
-- Installing: /usr/local/FreeCAD.app/Contents/data/Mod/Path/Resources/icons/PathWorkbench.svg
-- Installing: /usr/local/FreeCAD.app/Contents/Mod/Show/__init__.py
-- Installing: /usr/local/FreeCAD.app/Contents/Mod/Show/DepGraphTools.py
-- Installing: /usr/local/FreeCAD.app/Contents/Mod/Show/FrozenClass.py
-- Installing: /usr/local/FreeCAD.app/Contents/Mod/Show/TempoVis.py
-- Installing: /usr/local/FreeCAD.app/Contents/Mod/Measure/Init.py
CMake Error at src/Mod/Measure/cmake_install.cmake:31 (file):
  file INSTALL cannot find
  "/Users/blacey/FreeCAD-MacOS-CI/src/Mod/Measure/InitGui.py".
Call Stack (most recent call first):
  src/Mod/cmake_install.cmake:60 (include)
  src/cmake_install.cmake:44 (include)
  cmake_install.cmake:53 (include)
  
make: *** [install] Error 1
Sure enough, Mod/Measure/InitGui.py does not exist. I could gin up a InitGui.py but why doesn't this error occur on other platforms?
User avatar
sgrogan
Posts: 5651
Joined: Wed Oct 22, 2014 5:02 pm

Re: TechDraw to Master

Postby sgrogan » Thu Jun 30, 2016 10:51 pm

Code: Select all

if(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/Mod/Measure" TYPE FILE FILES
    "C:/Users/Chris/GitHub/FreeCAD-TechDraw/src/Mod/Measure/Init.py"
    "C:/Users/Chris/GitHub/FreeCAD-TechDraw/src/Mod/Measure/InitGui.py"
    )
endif()
?
I don't build the INSTALL target. I package from the build directory, I'll check?
blacey
Posts: 370
Joined: Tue Dec 08, 2015 11:28 pm

Re: TechDraw to Master

Postby blacey » Thu Jun 30, 2016 10:59 pm

Then my current test that I am building where I have removed the INSTALL of InitGui.py from the Measure/CMakeLists.txt should succeed ;) However, this is definitely an issue.
blacey
Posts: 370
Joined: Tue Dec 08, 2015 11:28 pm

Re: TechDraw to Master

Postby blacey » Thu Jun 30, 2016 11:06 pm

Success. All unit tests pass. Because Measure does not have a UI, InitGui.py is not needed. I will submit a pull request to WandererFan's repo.

Code: Select all

OS: Mac OS X
Word size of OS: 64-bit
Word size of FreeCAD: 64-bit
Version: 0.17.7897 (Git)
Build type: Unknown
Branch: techdraw
Hash: 0c327bfc78beba236cc864065b7f0c3e98530493
Python version: 2.7.11
Qt version: 4.8.7
Coin version: 3.1.3
OCC version: 7.0.0
blacey
Posts: 370
Joined: Tue Dec 08, 2015 11:28 pm

Re: TechDraw to Master

Postby blacey » Thu Jun 30, 2016 11:30 pm

For some reason, GitHub won't let me create a pull request against WandererFan's repo but here is the simple GitHub patch that can be applied with git apply