Permalink
Browse files

Merge branch 'master' of github.com:nddrylliog/oc

  • Loading branch information...
Amos Wenger
Amos Wenger committed Sep 11, 2011
2 parents 2ff8949 + 3dbc842 commit 18884c0e9373c331d73c6c956ff82735c711b70e
Showing with 24 additions and 24 deletions.
  1. +22 −23 README.md
  2. +2 −1 make
View
@@ -6,35 +6,38 @@ oc is an [ooc](http://ooc-lang.org) compiler written in ooc. It focuses on clean
You can install oc easily in only 42 steps:
- * Install boehm-gc, **with thread support** (e.g. 'threads' USEflag on Gentoo). Make sure it's recent, too.
+ * Install [boehm-gc](http://www.hpl.hp.com/personal/Hans_Boehm/gc/), **with thread support**. If your distribution has libgc by default, you can run:
+
+> nm -D /usr/lib/libgc.so | grep GC_pthread_create
+
* Make yourself a favor and [grab hub](http://defunkt.io/hub/) while you're at it.
* Then go all like:
- export OOC_DIR=~/ooc # or whatever you want
- mkdir -p $OOC_DIR && cd $OOC_DIR
- hub clone nddrylliog/rock && cd rock
- make rescue && sudo make install
+> export OOC_DIR=~/ooc
+> mkdir -p $OOC_DIR && cd $OOC_DIR
+> hub clone nddrylliog/rock && cd rock
+> make rescue && sudo make install
* This should end with 'Congrats! You have a rock in bin/rock. If it does nawt, [report an issue](https://github.com/nddrylliog/rock/issues).
* Now it's time to get greg and nagaqueen!
- cd $OOC_DIR
- hub clone nddrylliog/greg && cd greg
- make && sudo make install
+> cd $OOC_DIR
+> hub clone nddrylliog/greg && cd greg
+> make && sudo make install
- cd $OOC_DIR
- hub clone nddrylliog/nagaqueen
+> cd $OOC_DIR
+> hub clone nddrylliog/nagaqueen
* Now we'll grab oc, along with a frontend and a backend, and compile the shiznit out of it:
- cd $OOC_DIR
- hub clone nddrylliog/oc
- hub clone nddrylliog/oc-nagaqueen
- hub clone nddrylliog/oc-c89
- export PREFIX=$OOC_DIR/oc/prefix
- cd oc-nagaqueen && ./make && cd ..
- cd oc-c89 && ./make && cd ..
- cd oc && ./make && sudo make install
+> cd $OOC_DIR
+> hub clone nddrylliog/oc
+> hub clone nddrylliog/oc-nagaqueen
+> hub clone nddrylliog/oc-c89
+> export PREFIX=$OOC_DIR/oc/prefix
+> cd oc-nagaqueen && ./make && cd ..
+> cd oc-c89 && ./make && cd ..
+> cd oc && ./make && sudo make install
* If everything went fine, you should now be the happy owner of an oc setup!
* Since oc is entirely modular, feel free to write another frontend, or another
@@ -43,8 +46,4 @@ You can install oc easily in only 42 steps:
## About the transition
-We are trying to make the eventual transition between rock and oc as smooth as possible. There will be almost no syntax changes to ooc itself.
-
-There isn't a roadmap yet, but oc should be in a usable state between now and a few months.
-
-For more infos, refer to the docs/ which are updated as the development progresses
+Oh who am I kidding, I'm changing ideas every 15 minutes anyway. We do thoroughly love zeromq lately, though :)
View
3 make
@@ -25,7 +25,8 @@ fi
rock $OOC_FLAGS -libfolder=$ROCK_DIST/sdk -dynamiclib=$LIBDIR/librock-sdk.so || exit 1
echo "Compiling oc (core)"
-rock $OOC_FLAGS -libfolder=source/core -dynamiclib=$LIBDIR/liboc-core.so +-DBUILD_DATE="\"$(date '+%Y-%m-%d at %H:%M')\"" || exit 2
+BUILD_DATE="\"$(date '+%Y-%m-%d at %H:%M')\""
+rock $OOC_FLAGS -libfolder=source/core -dynamiclib=$LIBDIR/liboc-core.so +-DBUILD_DATE="$(BUILD_DATE)" || exit 2
echo "Compiling oc (launcher)"
rock $OOC_FLAGS -sourcepath=source -packagefilter=launcher launcher/main -L$LIBDIR -gc=dynamic -lrock-sdk -loc-core -lnagaqueen -o=bin/oc $OOC_FLAGS || exit 3

0 comments on commit 18884c0

Please sign in to comment.