ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/4coder/4coder

This commit is contained in:
Allen Webster 2017-11-12 13:48:06 -05:00
parent 06faf1cab2 d67546b4b2
commit 345f9d31ac
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
4coder_API/version.h
View File

@ -1,6 +1,6 @@
#define MAJOR 4 #define MAJOR 4
#define MINOR 0 #define MINOR 0
#define PATCH 22 #define PATCH 23
// string // string
#define VN__(a,b,c) #a "." #b "." #c #define VN__(a,b,c) #a "." #b "." #c

29
4coder_project_commands.cpp
View File

@ -582,27 +582,6 @@ project_is_setup(Application_Links *app, char *dir, int32_t dir_len, int32_t dir
return(result); return(result);
} }
// TODO(allen): For this purpose we shouldn't go this far.
// Instead just let the CWD of the running script be the code home.
static char get_code_home[] =
"# Store the real CWD\n"
"REAL_PWD=\"$PWD\"\n\n"
"# Find the code home folder\n"
"TARGET_FILE=\"$0\"\n"
"cd `dirname $TARGET_FILE`\n"
"TARGET_FILE=`basename $TARGET_FILE`\n"
"while [ -L \"$TARGET_FILE\" ]\n"
"do\n"
"TARGET_FILE=`readlink $TARGET_FILE`\n"
"cd `dirname $TARGET_FILE`\n"
"TARGET_FILE=`basename $TARGET_FILE`\n"
"done\n"
"PHYS_DIR=`pwd -P`\n"
"SCRIPT_FILE=$PHYS_DIR/$TARGET_FILE\n"
"CODE_HOME=$(dirname \"$SCRIPT_FILE\")\n\n"
"# Restore the PWD\n"
"cd \"$REAL_PWD\"\n\n";
// TODO(allen): Stop using stdio.h, switch to a 4coder buffer API for all file manipulation. // TODO(allen): Stop using stdio.h, switch to a 4coder buffer API for all file manipulation.
#include <stdio.h> #include <stdio.h>
CUSTOM_COMMAND_SIG(setup_new_project){ CUSTOM_COMMAND_SIG(setup_new_project){
@ -695,12 +674,12 @@ CUSTOM_COMMAND_SIG(setup_new_project){
if (sh_script != 0){ if (sh_script != 0){
fprintf(sh_script, "#!/bin/bash\n\n"); fprintf(sh_script, "#!/bin/bash\n\n");
fprintf(sh_script, "%s", get_code_home); fprintf(sh_script, "CODE_HOME=\"$PWD\"\n");
fprintf(sh_script, "OPTS=%.*s\n", fprintf(sh_script, "OPTS=%.*s\n",
default_flags_sh.size, default_flags_sh.str); default_flags_sh.size, default_flags_sh.str);
fprintf(sh_script, "pushd %.*s\n", fprintf(sh_script, "pushd %.*s > /dev/null\n",
output_dir.size, output_dir.str); output_dir.size, output_dir.str);
fprintf(sh_script, "%.*s $OPTS $CODE_HOME/%.*s -o %.*s\n", fprintf(sh_script, "%.*s $OPTS $CODE_HOME/%.*s -o %.*s\n",
default_compiler_sh.size, default_compiler_sh.str, default_compiler_sh.size, default_compiler_sh.str,
@ -740,13 +719,13 @@ CUSTOM_COMMAND_SIG(setup_new_project){
replace_str(&output_dir, "\\\\", "/"); replace_str(&output_dir, "\\\\", "/");
replace_str(&binary_file, "\\\\", "/"); replace_str(&binary_file, "\\\\", "/");
fprintf(project_script, "fkey_command_linux[1] = {\"build.sh\", \"*compilation*\", true , true };\n"); fprintf(project_script, "fkey_command_linux[1] = {\"./build.sh\", \"*compilation*\", true , true };\n");
fprintf(project_script, fprintf(project_script,
"fkey_command_linux[2] = {\"%.*s/%.*s\", \"*run*\", false , true };\n", "fkey_command_linux[2] = {\"%.*s/%.*s\", \"*run*\", false , true };\n",
output_dir.size, output_dir.str, output_dir.size, output_dir.str,
binary_file.size, binary_file.str); binary_file.size, binary_file.str);
fprintf(project_script, "fkey_command_mac[1] = {\"build.sh\", \"*compilation*\", true , true };\n"); fprintf(project_script, "fkey_command_mac[1] = {\"./build.sh\", \"*compilation*\", true , true };\n");
fprintf(project_script, fprintf(project_script,
"fkey_command_mac[2] = {\"%.*s/%.*s\", \"*run*\", false , true };\n", "fkey_command_mac[2] = {\"%.*s/%.*s\", \"*run*\", false , true };\n",
output_dir.size, output_dir.str, output_dir.size, output_dir.str,