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

try 'ros version=t run' to show version of the implementations.

Browse source
This commit is contained in:
SANO Masatoshi 2015-08-22 13:58:38 +09:00
parent 9894e141ef
commit 10be1a1085
5 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -29,7 +29,7 @@ script:
- if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$BREW" = "true" ]; then brew install roswell --verbose --HEAD; fi
- if [ "$BREW" != "true" ]; then sh ./scripts/install-for-ci.sh; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ] || [ "$BREW" != "true" ]; then ros version; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ] || [ "$BREW" != "true" ]; then ros -v run -- --version; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ] || [ "$BREW" != "true" ]; then ros -v version=t run; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ] || [ "$BREW" != "true" ]; then ros config; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ] || [ "$BREW" != "true" ]; then ros -s prove-asdf -s quri-test -e "(asdf:test-system :quri-test)"; fi

5
src/cmd-run-ccl.c
View file

@ -31,6 +31,7 @@ char** cmd_run_ccl(int argc,char** argv,struct sub_command* cmd) {
int offset=8; /*[binpath for ccl] --no-init --quiet --batch --image-name param --eval init.lisp
[terminating NULL] that total 9 are default. */
int i;
char* ccl_version=get_opt("version",0);
int paramc=0;
char* impl_path= cat(home,"impls",SLASH,arch,SLASH,os,SLASH,impl,SLASH,version,NULL);
char* bin;
@ -49,6 +50,8 @@ char** cmd_run_ccl(int argc,char** argv,struct sub_command* cmd) {
bin=s_cat(q(impl_path),q(SLASH),ccl_binname(),q(EXE_EXTENTION),NULL);
}
if(ccl_version)
offset+=1;
if(script)
offset+=1;
if(quicklisp)
@ -59,6 +62,8 @@ char** cmd_run_ccl(int argc,char** argv,struct sub_command* cmd) {
arg=alloc(sizeof(char*)*(offset+argc));
arg[paramc++]=q("wrapper-dummy");
arg[paramc++]=bin;
if(ccl_version)
arg[paramc++]=q("--version");
arg[paramc++]=q("--no-init");
arg[paramc++]=q("--quiet");
if(image||!issystem)

6
src/cmd-run-clisp.c
View file

@ -55,6 +55,12 @@ char** cmd_run_clisp(int argc,char** argv,struct sub_command* cmd) {
arg=alloc(sizeof(char*)*(offset+argc));
arg[paramc++]=q("wrapper-dummy");
arg[paramc++]=bin;
if(clisp_version) {
arg[paramc++]=q("--version");
simple=1;
}
for(i=1;i<argc;++i) {
arg[paramc++]=argv[i];
if(strcmp(argv[i],"--version")==0)

6
src/cmd-run-cmu.c
View file

@ -36,7 +36,7 @@ char** cmd_run_cmu(int argc,char** argv,struct sub_command* cmd) {
if(control_stack_size)
offset+=2;
if(cmu_version)
offset+=1;
offset+=2;
if(script)
offset+=1;
if(quicklisp)
@ -76,6 +76,10 @@ char** cmd_run_cmu(int argc,char** argv,struct sub_command* cmd) {
arg[paramc++]=q("-control-stack-size");
arg[paramc++]=q(control_stack_size);
}
if(cmu_version) {
arg[paramc++]=q("-eval");
arg[paramc++]=q("(progn (format t \"~A ~A~%\" (lisp-implementation-type) (lisp-implementation-version))(extensions:quit))");
}
arg[paramc++]=q("-eval");
arg[paramc++]=s_cat(q("(progn(setq *load-verbose*()*compile-verbose*())#-ros.init(cl:load \""),s_escape_string(lispdir()),q("init.lisp"),q("\"))"),NULL);

9
src/cmd-run.c
View file

@ -64,7 +64,6 @@ int cmd_run(int argc,char **argv,struct sub_command* cmd) {
}else {
char* tmp[]={"--",ROS_RUN_REPL};
proccmd(1,tmp,run_options,run_commands);
//return proccmd(1,tmp,top_options,top_commands);
}
cond_printf(1,"cmd_%s ends here %d\n",cmd->name,i);
return i;
@ -135,6 +134,13 @@ int cmd_script_frontend(int argc,char **argv,struct sub_command* cmd) {
return 0;
}
/*int cmd_run_version (int argc,char **argv,struct sub_command* cmd) {
cond_printf(1,"cmd_run_version called\n");
set_opt(&local_opt,"version","t",0);
return 1;
}
*/
int cmd_run_star(int argc,char **argv,struct sub_command* cmd) {
int ret=1;
char* impl;
@ -263,6 +269,7 @@ void register_cmd_run(void) {
/*options*/
run_options=register_runtime_options(run_options);
run_options=add_command(run_options,"",NULL,cmd_run_star,OPT_SHOW_NONE,1,NULL,NULL);
/*run_options=add_command(run_options,"version",NULL,cmd_run_version,OPT_SHOW_NONE,0,NULL,NULL);*/
run_options=nreverse(run_options);
/*commands*/