common-lisp/roswell.roswell
1
0
Fork 0
mirror of https://github.com/roswell/roswell.git synced 2026-09-10 07:16:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

changed subcommand name from opt to config.

Browse source
This commit is contained in:
SANO Masatoshi 2014-08-01 03:41:42 +09:00
parent c93b6e41a2
commit 30b77f7a38
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cmd_install.c
View file

@ -13,8 +13,8 @@ int installed_p(char* impl,char* version)
char* i;
if(strcmp(impl,"sbcl-bin")==0){
impl="sbcl";
i=s_cat(homedir(),q("impls/"),q(impl),q("-"),q(version),q("/"),NULL);
}
i=s_cat(homedir(),q("impls/"),q(impl),q("-"),q(version),q("/"),NULL);
ret=directory_exist_p(i);
s(i);
return ret;
@ -35,13 +35,12 @@ int start(char* impl,char* version)
printf("%s-%s are already installed.if you intend to reinstall by (TBD).\n",impl,version);
return 0;
}
if(install_running_p(impl,version)) {
printf("It seems running installation process for $1-$2.\n");
return 0;
}
if(strcmp(impl,"sbcl")==0 && NULL==get_opt("sbcl-compiler")) {
printf("compiler variable 'sbcl-compiler' should be specified");
if(strcmp(impl,"sbcl")==0 && NULL==get_opt("sbcl.compiler")) {
printf("compiler variable 'sbcl.compiler' should be specified\n");
return 0;
}
/*trap "exit 1" HUP INT PIPE QUIT TERM*/
@ -204,13 +203,14 @@ int configure(char* impl,char* version)
int sbcl_make(char* impl,char* version) {
char* home=homedir();
char* src=cat(home,"src/",impl,"-",version,NULL);
char* cmd=cat("sh make.sh \"","sbcl","\" ","--prefix=\"",home,"impls/",impl,"-",version,"\"",NULL);
char* compiler=cat(argv_orig[0]," -impl ",get_opt("sbcl.compiler")," run",NULL);
char* cmd=cat("sh make.sh \"",compiler,"\" ","--prefix=\"",home,"impls/",impl,"-",version,"\"",NULL);
printf("Building %s-%s\n",impl,version);
change_directory(src);
printf("cmd:%s\n",cmd);
system(cmd);
/* pipe connect for logging cim_with_output_control */
s(home),s(src),s(cmd);
s(home),s(src),s(cmd),s(compiler);
}
int sbcl_install(char* impl,char* version) {
@ -231,7 +231,7 @@ int sbcl_install(char* impl,char* version) {
change_directory(src);
setenv("SBCL_HOME",sbcl_home,1);
setenv("INSTALL_ROOT",install_root,1);
if(system("sh install.sh")==-1) {
if(system_redirect("sh install.sh","/tmp/hoge")==-1) {
ret=0;
}
s(home);

2
src/lsp.c
View file

@ -28,7 +28,7 @@ static struct sub_command commands[] = {
{ "version", cmd_version},
{ "install", cmd_install},
{ "run",cmd_run},
{ "opt", cmd_opt},
{ "config", cmd_opt},
{ "set", cmd_notyet},
{ "tar",cmd_tar},
{ "download",cmd_download},