From 165c0608cd5164fe5522788ab11c047bcc1421af Mon Sep 17 00:00:00 2001 From: Brian Soule Date: Tue, 7 Oct 2014 16:06:46 -0700 Subject: [PATCH 1/9] Added instructions on how to re-launch the pier. --- README.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.markdown b/README.markdown index 7855c204b..bf2bf5315 100644 --- a/README.markdown +++ b/README.markdown @@ -119,6 +119,8 @@ is also a Hoon REPL): If you would like to safely bring this ship back into port (End the Unix process), just enter Control-D. +To re-launch your peir after creation run `bin/vere mypier` (exclude the `-c`) + ###4. Registration From f56b83975fb02a60c4f90bdbeb86ddbd35429786 Mon Sep 17 00:00:00 2001 From: Brian Soule Date: Tue, 7 Oct 2014 16:20:27 -0700 Subject: [PATCH 2/9] +1 spelling --- README.markdown | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index bf2bf5315..4303b6970 100644 --- a/README.markdown +++ b/README.markdown @@ -119,8 +119,7 @@ is also a Hoon REPL): If you would like to safely bring this ship back into port (End the Unix process), just enter Control-D. -To re-launch your peir after creation run `bin/vere mypier` (exclude the `-c`) - +To re-launch your pier after creation run `bin/vere mypier` (exclude the `-c`) ###4. Registration From 465cba3acec9c83fd7747713ec65e0b758a5b0a1 Mon Sep 17 00:00:00 2001 From: David Cowden Date: Thu, 16 Oct 2014 09:54:10 -0500 Subject: [PATCH 3/9] Add libtool dependency to code snippet for OSX --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 4303b6970..c2c051854 100644 --- a/README.markdown +++ b/README.markdown @@ -51,7 +51,7 @@ Otherwise, install XCode: `https://developer.apple.com/xcode/`, with the command To install dependencies pick either one of Homebrew or Macports, but not both: Homebrew - - `brew install git gmp libsigsegv openssl` + `brew install git gmp libsigsegv openssl libtool` Macports - `sudo port install git gmp libsigsegv openssl` From 76df4b6f6acb28aa3d4f977d6124f7eb89e5cee7 Mon Sep 17 00:00:00 2001 From: Jared Hance Date: Sat, 18 Oct 2014 13:52:14 -0400 Subject: [PATCH 4/9] Add shortrules to Makefile, enable. Now output spam is less annoying. --- Makefile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 62b28ded2..0d52c1b5b 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,9 @@ endif # ENDIAN=little +# Change if you want to see verbose output +SHORTRULES=yes + # Binary directory - not in quotes. # BIN=bin @@ -74,8 +77,15 @@ CFLAGS= -O2 -g -msse3 -ffast-math \ CWFLAGS=-Wall +ifeq ($(SHORTRULES),yes) .c.o: - $(CC) -c $(CWFLAGS) $(CFLAGS) -o $@ $< + @echo " CC $@" + @$(CC) -c $(CWFLAGS) $(CFLAGS) -o $@ $< +else +.c.o: + (CC) -c $(CWFLAGS) $(CFLAGS) -o $@ $< +endif + F_OFILES=\ f/rail.o \ @@ -349,9 +359,16 @@ $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBR $(V_OFILES) f/loom.o f/trac.o: include/v/vere.h +ifeq ($(SHORTRULES),yes) +$(BIN)/vere: $(LIBCRE) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM) + @echo " LD bin/vere" + @mkdir -p $(BIN) + @$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM) $(LIBS) +else $(BIN)/vere: $(LIBCRE) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM) mkdir -p $(BIN) $(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM) $(LIBS) +endif tags: ctags -R -f .tags --exclude=root From d224338085a026b200c727c8f2fca637e5126c51 Mon Sep 17 00:00:00 2001 From: Alex Flint Date: Sat, 18 Oct 2014 16:34:53 -0400 Subject: [PATCH 5/9] add autoconf and automake to OSX build instructions --- README.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index c2c051854..71eb38418 100644 --- a/README.markdown +++ b/README.markdown @@ -51,10 +51,10 @@ Otherwise, install XCode: `https://developer.apple.com/xcode/`, with the command To install dependencies pick either one of Homebrew or Macports, but not both: Homebrew - - `brew install git gmp libsigsegv openssl libtool` + `brew install git gmp libsigsegv openssl libtool autoconf automake` Macports - - `sudo port install git gmp libsigsegv openssl` + `sudo port install git gmp libsigsegv openssl autoconf automake` Although automake/autoconf/libtool are generally installed by default, some have reported needing to uninstall and reinstall those three packages, at least From ed683044c5e5c1e0f7158a45b1a76accb24541fe Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Sat, 8 Nov 2014 19:12:06 -0800 Subject: [PATCH 6/9] hn --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 71eb38418..d68190770 100644 --- a/README.markdown +++ b/README.markdown @@ -135,7 +135,7 @@ Instead, registering for a destroyer will get you a nice short name like Destroyers are rarer ships meant to be associated with a user's digital identity. They are far fewer destroyers in the Urbit namespace than submarines. -Tlon would be glad to give you a destroyer from the batch that they own. Head over to [tlon.io](http://tlon.io) to complete the automated registration process. +[During this period of development we are no longer giving away destroyers. If you would like to know when we are offering ships again, please head to urbit.org and enter your email address or email ship [at] urbit.org] Your destroyers will arrive in the form of `[ship ticket]` pairs. Let's say one of your ships is `~waclux-tomwyc` and its ticket is From fa02dcfba8a67c54a801707bf41f89c4befd458e Mon Sep 17 00:00:00 2001 From: vere Date: Tue, 11 Nov 2014 02:36:13 +0000 Subject: [PATCH 7/9] Fix clay timer explosion on zod. --- v/ames.c | 19 +++++++++++-------- v/reck.c | 17 +++++++++++++++-- v/unix.c | 19 ++++++++++++------- 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/v/ames.c b/v/ames.c index 63657ab9a..502481d31 100644 --- a/v/ames.c +++ b/v/ames.c @@ -241,16 +241,19 @@ static void _ames_time_cb(uv_timer_t* tim_uo) { u2_ames* sam_u = &u2_Host.sam_u; - u2_lo_open(); - sam_u->law_w = time(0); - { - u2_reck_plan - (u2A, - u2nt(u2_blip, c3__ames, u2_nul), - u2nc(c3__wake, u2_nul)); + if ( u2_nul == u2A->roe ) { + u2_lo_open(); + + sam_u->law_w = time(0); + { + u2_reck_plan + (u2A, + u2nt(u2_blip, c3__ames, u2_nul), + u2nc(c3__wake, u2_nul)); + } + u2_lo_shut(u2_no); } - u2_lo_shut(u2_no); } /* _ames_recv_cb(): receive callback. diff --git a/v/reck.c b/v/reck.c index 19b194282..d3f8092df 100644 --- a/v/reck.c +++ b/v/reck.c @@ -124,19 +124,19 @@ _reck_nock_poke(u2_reck* rec_u, u2_noun ovo) u2_noun fun = u2_cn_nock(u2k(rec_u->roc), u2k(u2_cx_at(42, rec_u->roc))); u2_noun sam, pro; - sam = u2nc(u2k(rec_u->now), ovo); #if 0 { c3_c* ovi_c = u2_cr_string(u2h(u2t(ovo))); u2_noun tox = _reck_spat(rec_u, u2k(u2h(ovo))); c3_c* tox_c = u2_cr_string(tox); - uL(fprintf(uH, "poke: %%%s on %s\n", ovi_c, tox_c)); + fprintf(stderr, "poke: %%%s on %s\r\n", ovi_c, tox_c); free(tox_c); free(ovi_c); u2z(tox); } #endif + sam = u2nc(u2k(rec_u->now), ovo); #if 0 { c3_c* ovi_c = u2_cr_string(u2h(u2t(ovo))); @@ -816,6 +816,19 @@ u2_reck_plan(u2_reck* rec_u, { if ( u2_raty_lead == u2R->typ_e ) { u2_noun egg = u2nc(pax, fav); + +#if 0 + { + c3_c* ovi_c = u2_cr_string(u2h(u2t(egg))); + u2_noun tox = _reck_spat(rec_u, u2k(u2h(egg))); + c3_c* tox_c = u2_cr_string(tox); + + fprintf(stderr, "plan: %%%s on %s\r\n", ovi_c, tox_c); + + free(tox_c); free(ovi_c); u2z(tox); + } +#endif + rec_u->roe = u2nc(u2nc(u2_nul, egg), rec_u->roe); } else { diff --git a/v/unix.c b/v/unix.c index 3d696cd8c..81475c226 100644 --- a/v/unix.c +++ b/v/unix.c @@ -1410,14 +1410,16 @@ _unix_ef_sync(uv_check_t* han_u) static void _unix_time_cb(uv_timer_t* tim_u) { - u2_lo_open(); - { - u2_reck_plan - (u2A, - u2nt(u2_blip, c3__clay, u2_nul), - u2nc(c3__wake, u2_nul)); + if ( u2_nul == u2A->roe ) { + u2_lo_open(); + { + u2_reck_plan + (u2A, + u2nt(u2_blip, c3__clay, u2_nul), + u2nc(c3__wake, u2_nul)); + } + u2_lo_shut(u2_no); } - u2_lo_shut(u2_no); } /* _unix_sign_cb: signal callback. @@ -1566,6 +1568,9 @@ u2_unix_io_poll(void) } else unx_u->alm = u2_yes; + if ( gap_d < 1000 ) { + gap_d = 1000; + } uv_timer_start(&unx_u->tim_u, _unix_time_cb, gap_d, 0); } else { From 16952e13f8515cf101c4b12511509eb7fefcaf94 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 11 Nov 2014 11:03:16 -0800 Subject: [PATCH 8/9] Band-aid on a clay timer bug. --- v/unix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/v/unix.c b/v/unix.c index 3d696cd8c..7e0cc3510 100644 --- a/v/unix.c +++ b/v/unix.c @@ -1566,6 +1566,7 @@ u2_unix_io_poll(void) } else unx_u->alm = u2_yes; + if ( gap_d < 1000 ) { gap_d = 1000; } // band-aid on an unknown clay timer bug uv_timer_start(&unx_u->tim_u, _unix_time_cb, gap_d, 0); } else { From cf743aa690d7a9fcd319f296782021e3510e21ea Mon Sep 17 00:00:00 2001 From: Jared Hance Date: Thu, 13 Nov 2014 18:34:10 -0500 Subject: [PATCH 9/9] Revert "Add shortrules to Makefile, enable." This reverts commit 58d7bf855e7fc3733ec43cc63147910c4d4a5727. --- Makefile | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 0d52c1b5b..62b28ded2 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,6 @@ endif # ENDIAN=little -# Change if you want to see verbose output -SHORTRULES=yes - # Binary directory - not in quotes. # BIN=bin @@ -77,15 +74,8 @@ CFLAGS= -O2 -g -msse3 -ffast-math \ CWFLAGS=-Wall -ifeq ($(SHORTRULES),yes) .c.o: - @echo " CC $@" - @$(CC) -c $(CWFLAGS) $(CFLAGS) -o $@ $< -else -.c.o: - (CC) -c $(CWFLAGS) $(CFLAGS) -o $@ $< -endif - + $(CC) -c $(CWFLAGS) $(CFLAGS) -o $@ $< F_OFILES=\ f/rail.o \ @@ -359,16 +349,9 @@ $(CRE2_OFILES): outside/cre2/src/src/cre2.cpp outside/cre2/src/src/cre2.h $(LIBR $(V_OFILES) f/loom.o f/trac.o: include/v/vere.h -ifeq ($(SHORTRULES),yes) -$(BIN)/vere: $(LIBCRE) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM) - @echo " LD bin/vere" - @mkdir -p $(BIN) - @$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM) $(LIBS) -else $(BIN)/vere: $(LIBCRE) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM) mkdir -p $(BIN) $(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBCRE) $(LIBRE2) $(LIBED25519) $(BPT_O) $(LIBANACHRONISM) $(LIBS) -endif tags: ctags -R -f .tags --exclude=root