Building on the mac and git

classic Classic list List threaded Threaded
9 messages Options
Reply | Threaded
Open this post in threaded view
|

Building on the mac and git

devlaam
I have a question and a remark.

In the git repository there is an 'empty' directory
"libraries/mcad". Normally git does not allow for
empty directories, so it seems you used the famous
'hash-hack'.  However, at forking and merging this
is not so convenient, since it issues merge conflicts.
If you need an empty dir, simply put in a .gitignore
there, possibly with content that ignores all the files
you want to keep local.

Related to this, but there is also something i do not
understand, is why do i miss a lot of content when i
compile (without any modifications) openSCAD on my Mac.
This is my result

Contents
- Info.plist
- MacOS
   - OpenSCAD
- PkgInfo
- Resources
   - OpenSCAD.icns
   - OpenSCAD.sdef
   - SCAD.icns
   - dsa_pub.pem
   - empty.lproj

whereas you have

Contents
- Frameworks
   + QtCore.framework           - libboost_program_options.dylib
   + QtGui.framework            - libboost_regex.dylib
   + QtOpenGL.framework         - libboost_system.dylib
   + Sparkle.framework          - libboost_thread.dylib
   - libCGAL.dylib              - libgmp.dylib
   - libGLEW.1.9.0.dylib        - libmpfr.dylib
   - libboost_filesystem.dylib  - libopencsg.1.dylib
- MacOS
   - OpenSCAD
- PlugIns
   + accessible
   + codecs
   + imageformats
- Info.plist
- PkgInfo
- Resources
   + examples
   + libraries
   - OpenSCAD.icns
   - OpenSCAD.sdef
   - SCAD.icns
   - dsa_pub.pem
   - empty.lproj
   - qt.conf

how do i get the latter myself? The question is not
targeted at the dynamic libraries, but more at the
examples, libraries and other stuff missing.

Thank you.


_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566
Reply | Threaded
Open this post in threaded view
|

Re: Building on the mac and git

marcosscriven
Regarding the first point, libraries/mcad isn't a hack, it's a submodule:

http://git-scm.com/book/en/Git-Tools-Submodules

Reply | Threaded
Open this post in threaded view
|

Re: Building on the mac and git

devlaam
On 20-06-13 12:42, marcosscriven wrote:
> Regarding the first point, libraries/mcad isn't a hack, it's a submodule:
>
> http://git-scm.com/book/en/Git-Tools-Submodules

Hmm, i see, i thought is was something like this:
http://stackoverflow.com/questions/115983/how-do-i-add-an-empty-directory-to-a-git-repository/8944077#8944077

The point is, at forking, github did not seem to
understand this empty directory and issued an error.
Locally it results in merge failure, also if i directly
clone. (Or course i do not want to populate the submodule
with files.) Or i am doing something wrong (probably!),
or something is not correctly set up.

Ruud

_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566
Reply | Threaded
Open this post in threaded view
|

Re: Building on the mac and git

kintel
Administrator
On 2013-06-20, at 07:12 , Ruud Vlaming wrote:
>
> The point is, at forking, github did not seem to
> understand this empty directory and issued an error.

That's curious - doesn't 'git submodule update --init' work either (as described in the README) ?

It could be that you need to fork MCAD as well..
If you figure it out, please give some feedback (or update the  README :)).

 -Marius

_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566
Reply | Threaded
Open this post in threaded view
|

Re: Building on the mac and git

kintel
Administrator
In reply to this post by devlaam
On 2013-06-20, at 06:25 , Ruud Vlaming wrote:
>
> how do i get the latter myself? The question is not
> targeted at the dynamic libraries, but more at the
> examples, libraries and other stuff missing.
>
The libraries and examples in the source code should be available from your binary. Doesn't this work?

We only create a full bundle with all resources included for release builds. See scripts/publish-macosx.sh for how this process is done (it's a bit involved).

 -Marius

_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566
Reply | Threaded
Open this post in threaded view
|

Re: Building on the mac and git

David Powell
In reply to this post by kintel
on the same note ,,   make-qt4  as described in the linux build does not work on suse12.3 but using just make works fine with no problems 


On Thu, Jun 20, 2013 at 2:33 PM, Marius Kintel <[hidden email]> wrote:
On 2013-06-20, at 07:12 , Ruud Vlaming wrote:
>
> The point is, at forking, github did not seem to
> understand this empty directory and issued an error.

That's curious - doesn't 'git submodule update --init' work either (as described in the README) ?

It could be that you need to fork MCAD as well..
If you figure it out, please give some feedback (or update the  README :)).

 -Marius

_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566


_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566
Reply | Threaded
Open this post in threaded view
|

Re: Building on the mac and git

kintel
Administrator
On 2013-06-20, at 09:37 , David Powell wrote:

> on the same note ,,   make-qt4  as described in the linux build does not work on suse12.3 but using just make works fine with no problems
>
Could you point me to that description? the main README says:

"First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to run 'qmake4', 'qmake-qt4' or something alike to run the qt4 version of the tool.
Then run make. "

 -Marius

_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566
Reply | Threaded
Open this post in threaded view
|

Re: Building on the mac and git

David Powell


On Thu, Jun 20, 2013 at 2:40 PM, Marius Kintel <[hidden email]> wrote:
On 2013-06-20, at 09:37 , David Powell wrote:

> on the same note ,,   make-qt4  as described in the linux build does not work on suse12.3 but using just make works fine with no problems
>
Could you point me to that description? the main README says:

"First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to run 'qmake4', 'qmake-qt4' or something alike to run the qt4 version of the tool.
Then run make. "

 -Marius

_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566


_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566
Reply | Threaded
Open this post in threaded view
|

Re: Building on the mac and git

kintel
Administrator
On 2013-06-20, at 09:49 , David Powell wrote:
>
> http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Building_on_Linux/UNIX#Building_OpenSCAD_yourself
>
Ah - hard to keep two parallel docs in sync. It's a wiki though, so feel free to update it with your experiences :)

 -Marius

_______________________________________________
OpenSCAD mailing list
[hidden email]
http://rocklinux.net/mailman/listinfo/openscad
http://openscad.org - https://flattr.com/thing/121566