1
1
mirror of https://github.com/urbit/shrub.git synced 2024-12-26 21:44:11 +03:00
Commit Graph

1719 Commits

Author SHA1 Message Date
Philip C Monk
d109de1dbc cosmetic 2015-07-01 18:28:55 -04:00
Philip C Monk
a9b7a5c0c6 Merge remote-tracking branch 'origin/newunix' into test
Conflicts:
	urb/urbit.pill
	urb/zod/ape/hood.hoon
2015-06-29 16:04:16 -04:00
Philip C Monk
a1a6f1e00e Merge remote-tracking branch 'origin/master' into newunix
Conflicts:
	urb/urbit.pill
2015-06-29 15:40:14 -04:00
cgyarvin
2d23ec985c Merge pull request from max19/master
minor scrypt tweaks
2015-06-26 12:33:43 -07:00
Max G
fba3768e61 Merge remote-tracking branch 'upstream/master' 2015-06-26 21:26:04 +03:00
Anton Dyudin
5b71944a27 Merge branch 'newunix' of https://github.com/urbit/urbit into newunix 2015-06-24 12:51:36 -07:00
Anton Dyudin
cfe0339761 Rename %time to %behn, tym to now; closes 2015-06-24 12:50:30 -07:00
Raymond Pasco
c7ef30168a fix build with longer filenames 2015-06-24 12:43:19 -07:00
Philip C Monk
9edda1bb73 descriptive names for c files
fixes 
2015-06-23 21:29:11 -04:00
Philip C Monk
c05e6da07e Merge remote-tracking branch 'origin/newunix'
Conflicts:
	urb/urbit.pill
	urb/zod/base/mar/bit-accounts.hoon
	urb/zod/base/mar/bit-addr-made.hoon
	urb/zod/base/mar/bit-addr-request.hoon
	urb/zod/base/mar/bit-api-call.hoon
	urb/zod/base/mar/bit-get-token.hoon
	urb/zod/base/mar/bit-transaction.hoon
	urb/zod/base/mar/bit/accounts.hoon
	urb/zod/base/mar/bit/addr-made.hoon
	urb/zod/base/mar/bit/addr-request.hoon
	urb/zod/base/mar/bit/api-call.hoon
	urb/zod/base/mar/bit/get-token.hoon
	urb/zod/base/mar/bit/transaction.hoon
	urb/zod/base/mar/cloud-auth.hoon
	urb/zod/base/mar/cloud-secret.hoon
	urb/zod/base/mar/cloud/auth.hoon
	urb/zod/base/mar/cloud/secret.hoon
	urb/zod/base/mar/dill-belt.hoon
	urb/zod/base/mar/dill-blit.hoon
	urb/zod/base/mar/dill/belt.hoon
	urb/zod/base/mar/dill/blit.hoon
	urb/zod/base/mar/oct3-move.hoon
	urb/zod/base/mar/oct3-update.hoon
	urb/zod/base/mar/oct3/move.hoon
	urb/zod/base/mar/oct3/update.hoon
	urb/zod/base/mar/oct4-move.hoon
	urb/zod/base/mar/oct4-update.hoon
	urb/zod/base/mar/oct4/move.hoon
	urb/zod/base/mar/oct4/update.hoon
	urb/zod/base/mar/sole-action.hoon
	urb/zod/base/mar/sole-effect.hoon
	urb/zod/base/mar/sole/action.hoon
	urb/zod/base/mar/sole/effect.hoon
	urb/zod/base/mar/talk-command.hoon
	urb/zod/base/mar/talk-report.hoon
	urb/zod/base/mar/talk/command.hoon
	urb/zod/base/mar/talk/report.hoon
	urb/zod/mar/bit-accounts.hoon
	urb/zod/mar/bit-addr-made.hoon
	urb/zod/mar/bit-addr-request.hoon
	urb/zod/mar/bit-api-call.hoon
	urb/zod/mar/bit-get-token.hoon
	urb/zod/mar/bit-transaction.hoon
	urb/zod/mar/cloud-auth.hoon
	urb/zod/mar/cloud-auth/door.hook
	urb/zod/mar/cloud-secret.hoon
	urb/zod/mar/cloud-secret/door.hook
	urb/zod/mar/dill-belt.hoon
	urb/zod/mar/dill-blit.hoon
	urb/zod/mar/oct3-move.hoon
	urb/zod/mar/oct3-update.hoon
	urb/zod/mar/oct4-move.hoon
	urb/zod/mar/oct4-update.hoon
	urb/zod/mar/sole-action.hoon
	urb/zod/mar/sole-effect.hoon
	urb/zod/mar/talk-command.hoon
	urb/zod/mar/talk-report.hoon
2015-06-23 19:28:46 -04:00
Anton Dyudin
9d80d94843 recursively build cores, marks 2015-06-23 15:59:48 -07:00
Galen Wolfe-Pauly
fdaa5849db Merge pull request from yebyen/master
debian build deps
2015-06-23 12:15:07 -07:00
Kingdon Barrett
611a1ea096 debian build deps 2015-06-23 15:11:28 -04:00
cgyarvin
9b216f615d Merge pull request from dcow/parallel
Enable parallel builds (292)
2015-06-23 11:20:52 -07:00
David Cowden
1a40d36428 Enable parallel builds
Due to the earlier hack employed to enable `make distclean all`,
building urbit in parallel is not safe as it is possible `make`
will try to execute the rule that configures libuv twice at the
same time (since it is specified by two targets and no further
dependency exists). This change adds a dependency between the
two targets forcing them to be serialized by `make`.

libuv does not want to build in parallel either. Force it to
build sequentially too.

292
2015-06-23 10:08:19 -07:00
Anton Dyudin
ab3bf3a2d3 Merge branch 'test' into newunix
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/zuse.hoon
2015-06-22 17:19:55 -07:00
Philip C Monk
41b25f7bfe urb/zod/base -> urb/zod 2015-06-19 17:16:48 -04:00
Philip C Monk
8a17c2fa25 Merge branch 'newunix'
Conflicts:
	urb/zod/base/ape/dojo.hoon
	urb/zod/base/ape/talk.hoon
2015-06-19 17:03:42 -04:00
Philip C Monk
4bb801614a Merge remote-tracking branch 'origin/test' into newunix
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood.hoon
	urb/zod/base/arvo/zuse.hoon
	v/unix.c
2015-06-19 15:37:20 -04:00
Philip C Monk
2c08e416ba remove printfs 2015-06-19 15:26:11 -04:00
Philip C Monk
cded2d2822 good guys win 2015-06-19 15:09:33 -04:00
C. Guy Yarvin
399a68ed2a Remove debugging abort. 2015-06-19 09:28:06 -07:00
Raymond Pasco
6ad239df48 i guess we include git in the prereqs list 2015-06-19 04:07:46 +00:00
Raymond Pasco
7fdcc66815 Port to FreeBSD 2015-06-18 20:52:38 -07:00
Raymond Pasco
ea7bd8e695 u3_Signal should be a sigjmp_buf, not a jmp_buf 2015-06-18 20:32:04 -07:00
Philip C Monk
73852b5bad fix mounting single files 2015-06-18 23:06:30 -04:00
Philip C Monk
7b1ee48422 deleted deleteme's 2015-06-18 21:50:47 -04:00
Philip C Monk
f80fce37c1 die, memory leaks, die 2015-06-18 18:14:47 -04:00
Philip C Monk
aa631b4359 bug fixes 2015-06-18 17:44:12 -04:00
Philip C Monk
932273b120 bug fixes 2015-06-18 15:56:11 -04:00
Galen Wolfe-Pauly
6aa849fc15 Merge pull request from rastus-vernon/patch-2
Fixes to the command to install dependencies on Fedora
2015-06-18 08:38:44 -07:00
Rastus Vernon
506081af01 Use DNF instead of Yum for Fedora
Yum has been deprecated in favor of DNF in the latest stable Fedora
version and is no longer part of the base system. For this reason, the
command to install dependencies on Fedora should be changed to DNF.
2015-06-18 03:26:06 -04:00
Rastus Vernon
fa711b2bff Add ragel to the dependencies for yum
The build doesn't succeed if ragel is not installed.
2015-06-18 03:23:04 -04:00
Philip C Monk
981c824af3 bug fixes 2015-06-17 20:06:14 -04:00
Philip C Monk
12e0ea2a9b add :+unmount 2015-06-17 19:44:00 -04:00
Anton Dyudin
bfdc49c190 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-17 16:11:40 -07:00
Anton Dyudin
28f4b31a98 updated .gitignore 2015-06-17 14:09:34 -07:00
ault011
0767531c43 explain how to connect your console with + 2015-06-17 14:00:29 -07:00
ault011
60727b5f2b debian httprequests 2015-06-17 13:45:10 -07:00
Anton Dyudin
6fff94e254 Merge branch 'master' into test
Conflicts:
	urb/zod/base/pub/tree/src/js/main.js
2015-06-17 13:20:11 -07:00
Philip C Monk
b1c25114bf persist mount points across pier reboots 2015-06-17 15:06:40 -04:00
Raymond Pasco
5356f9268a AWS needs c++ 2015-06-17 14:34:25 -04:00
Galen Wolfe-Pauly
652c5afcd2 Merge branch 'master' of github.com:urbit/urbit 2015-06-17 10:21:29 -07:00
Galen Wolfe-Pauly
f28fcb1d7e register -> begin 2015-06-17 10:21:25 -07:00
Galen Wolfe-Pauly
0740c31020 Merge pull request from Tenari/patch-1
typo fix
2015-06-16 18:58:45 -07:00
Daniel Zapata
223a534e16 typo fix 2015-06-16 20:56:58 -05:00
Galen Wolfe-Pauly
47857f071d new readme 2015-06-16 18:27:28 -07:00
Galen Wolfe-Pauly
d4e76bf750 simpler readme 2015-06-16 18:25:32 -07:00
Philip C Monk
542b6f843a dealt with some memory leaks 2015-06-16 19:48:34 -04:00
Anton Dyudin
13fce572ea Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/mar/oct3-move.hoon
	urb/zod/base/pub/cloud/fab/hymn.hook
	urb/zod/base/pub/cloud/src/main.js
2015-06-16 15:19:51 -07:00