Merge branches 'top-down', 'claydoc-rebase', 'curtis-url-fix' and 'curtis-tutorial-3-4'

Conflicts:
	urb/zod/pub/docs/dev/hoon/tutorial/2-syntax.mdy

added urbit.pill

fixes #563
fixes #574
This commit is contained in:
Philip C Monk 2015-11-20 18:56:19 -05:00
commit d89cdded22
5 changed files with 57 additions and 5 deletions

View File

@ -55,6 +55,27 @@ Urbit can be installed on most Unix systems. There is no Windows
port. Windows is a wonderful OS, we just haven't gotten to it yet.
Use a VM.
Configure swap if needed
------------------------
Urbit wants to map 2GB of memory when it boots up. We won't
necessarily use all this memory, we just want to see it. On a
normal modern PC or Mac, this is not an issue. On some small
cloud virtual machines (Amazon or Digital Ocean), the default
memory configuration is smaller than this, and you need to
manually configure a swapfile.
To add swap to a DO droplet:
https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-ubuntu-14-04
To add swap on an Amazon instance:
http://stackoverflow.com/questions/17173972/how-do-you-add-swap-to-an-ec2-instance
Don't spend a lot of time tweaking these settings; the simplest
thing is fine.
Install as a package
--------------------

View File

@ -1120,6 +1120,7 @@
# define c3__unix c3_s4('u','n','i','x')
# define c3__unt c3_s3('u','n','t')
# define c3__up c3_s2('u','p')
# define c3__url c3_s3('u','r','l')
# define c3__use c3_s3('u','s','e')
# define c3__ut c3_s2('u','t')
# define c3__uv c3_s2('u','v')

View File

@ -1464,7 +1464,7 @@ _cm_init(c3_o chk_o)
-1, 0);
fprintf(stderr, "boot: mapping %dMB failed\r\n", (len_w / (1024 * 1024)));
fprintf(stderr, "see install instructions for adding swap space\r\n");
fprintf(stderr, "see urbit.org/docs/user/install for adding swap space\r\n");
if ( -1 != (c3_ps)map_v ) {
fprintf(stderr,
"if porting to a new platform, try U3_OS_LoomBase %p\r\n",

View File

@ -222,6 +222,7 @@ _main_getopt(c3_i argc, c3_c** argv)
static void
u3_ve_usage(c3_i argc, c3_c** argv)
{
#if 0
c3_c *use_c[] = {"Usage: %s [options...] computer\n",
"-c pier Create a new urbit in pier/\n",
"-w name Immediately upgrade to ~name\n",
@ -246,9 +247,19 @@ u3_ve_usage(c3_i argc, c3_c** argv)
"-k stage Start at Hoon kernel version stage\n",
"-R Report urbit build info\n",
"-Xwtf Skip last event\n"};
#else
c3_c *use_c[] = {
"simple usage: \n",
" %s -c <mycomet> to create a comet (anonymous urbit)\n",
" %s -w <myplanet> -t <myticket> if you have a ticket\n",
" %s <myplanet or mycomet> to restart an existing urbit\n",
0
};
#endif
c3_i i;
for ( i=0; i < sizeof(use_c)/sizeof(c3_c*); i++ ) {
fprintf(stderr,use_c[i],argv[0]);
for ( i=0; use_c[i]; i++ ) {
fprintf(stderr, use_c[i], argv[0]);
}
exit(1);
}
@ -383,6 +394,12 @@ main(c3_i argc,
fprintf(stderr, "normal usage: %s %s\n", argv[0], u3_Host.dir_c);
exit(1);
}
} else {
struct stat s;
if ( -1 == stat(u3_Host.dir_c, &s) ) {
fprintf(stderr, "%s: urbit not found\n", u3_Host.dir_c);
u3_ve_usage(argc, argv);
}
}
#if 0

View File

@ -1125,12 +1125,25 @@ _term_ef_blit(u3_utty* uty_u,
u3_noun pib = u3k(u3t(u3t(blt)));
u3_noun jam;
fprintf(stderr, "jamming...\r\n");
jam = u3ke_jam(pib);
fprintf(stderr, "jammed.\r\n");
_term_it_save(u3k(u3h(u3t(blt))), jam);
} break;
case c3__url: {
if ( c3n == u3ud(u3t(blt)) ) {
break;
} else {
c3_c* txt_c = u3r_string(u3t(blt));
_term_it_show_clear(uty_u);
_term_it_write_str(uty_u, txt_c);
free(txt_c);
_term_it_show_more(uty_u);
_term_it_refresh_line(uty_u);
}
}
}
u3z(blt);