You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2016/07/08 12:25:24 UTC
lucy-clownfish git commit: Regenerate charmonizer.c
Repository: lucy-clownfish
Updated Branches:
refs/heads/master be1957bfb -> 56f1982e7
Regenerate charmonizer.c
Removes MakeRule_add_command_with_libpath.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/56f1982e
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/56f1982e
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/56f1982e
Branch: refs/heads/master
Commit: 56f1982e70d48fd4cd2c7021a1ddbbb5a6028963
Parents: be1957b
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Fri Jul 8 14:24:28 2016 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Fri Jul 8 14:24:28 2016 +0200
----------------------------------------------------------------------
compiler/common/charmonizer.c | 61 --------------------------------------
runtime/common/charmonizer.c | 61 --------------------------------------
2 files changed, 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/56f1982e/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index c224853..520148b 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -810,15 +810,6 @@ chaz_MakeRule_add_prereq(chaz_MakeRule *self, const char *prereq);
void
chaz_MakeRule_add_command(chaz_MakeRule *self, const char *command);
-/** Add a command to be executed with a special runtime library path.
- *
- * @param command The additional command.
- * @param ... NULL-terminated list of library directories.
- */
-void
-chaz_MakeRule_add_command_with_libpath(chaz_MakeRule *self,
- const char *command, ...);
-
/** Add a command to remove one or more files.
*
* @param files The list of files.
@@ -5373,58 +5364,6 @@ chaz_MakeRule_add_command(chaz_MakeRule *self, const char *command) {
}
void
-chaz_MakeRule_add_command_with_libpath(chaz_MakeRule *self,
- const char *command, ...) {
- va_list args;
- char *path = NULL;
- char *lib_command = NULL;
- int binfmt = chaz_CC_binary_format();
-
- if (binfmt == CHAZ_CC_BINFMT_ELF) {
- va_start(args, command);
- path = chaz_Util_vjoin(":", args);
- va_end(args);
-
- lib_command = chaz_Util_join("", "LD_LIBRARY_PATH=", path,
- ":$$LD_LIBRARY_PATH ", command, NULL);
-
- free(path);
- }
- else if (binfmt == CHAZ_CC_BINFMT_PE) {
- if (chaz_Make.shell_type == CHAZ_OS_CMD_EXE) {
- va_start(args, command);
- path = chaz_Util_vjoin(";", args);
- va_end(args);
-
- /* It's important to not add a space before `&&`. Otherwise, the
- * space is added to the search path.
- */
- lib_command = chaz_Util_join("", "path ", path, ";%path%&& ",
- command, NULL);
- }
- else {
- va_start(args, command);
- path = chaz_Util_vjoin(":", args);
- va_end(args);
-
- lib_command = chaz_Util_join("", "PATH=", path, ":$$PATH ",
- command, NULL);
- }
-
- free(path);
- }
- else {
- /* Assume that library paths are compiled into the executable on
- * Darwin.
- */
- lib_command = chaz_Util_strdup(command);
- }
-
- chaz_MakeRule_add_command(self, lib_command);
- free(lib_command);
-}
-
-void
chaz_MakeRule_add_rm_command(chaz_MakeRule *self, const char *files) {
char *command;
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/56f1982e/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.c b/runtime/common/charmonizer.c
index 5bce6b4..7448e25 100644
--- a/runtime/common/charmonizer.c
+++ b/runtime/common/charmonizer.c
@@ -810,15 +810,6 @@ chaz_MakeRule_add_prereq(chaz_MakeRule *self, const char *prereq);
void
chaz_MakeRule_add_command(chaz_MakeRule *self, const char *command);
-/** Add a command to be executed with a special runtime library path.
- *
- * @param command The additional command.
- * @param ... NULL-terminated list of library directories.
- */
-void
-chaz_MakeRule_add_command_with_libpath(chaz_MakeRule *self,
- const char *command, ...);
-
/** Add a command to remove one or more files.
*
* @param files The list of files.
@@ -5373,58 +5364,6 @@ chaz_MakeRule_add_command(chaz_MakeRule *self, const char *command) {
}
void
-chaz_MakeRule_add_command_with_libpath(chaz_MakeRule *self,
- const char *command, ...) {
- va_list args;
- char *path = NULL;
- char *lib_command = NULL;
- int binfmt = chaz_CC_binary_format();
-
- if (binfmt == CHAZ_CC_BINFMT_ELF) {
- va_start(args, command);
- path = chaz_Util_vjoin(":", args);
- va_end(args);
-
- lib_command = chaz_Util_join("", "LD_LIBRARY_PATH=", path,
- ":$$LD_LIBRARY_PATH ", command, NULL);
-
- free(path);
- }
- else if (binfmt == CHAZ_CC_BINFMT_PE) {
- if (chaz_Make.shell_type == CHAZ_OS_CMD_EXE) {
- va_start(args, command);
- path = chaz_Util_vjoin(";", args);
- va_end(args);
-
- /* It's important to not add a space before `&&`. Otherwise, the
- * space is added to the search path.
- */
- lib_command = chaz_Util_join("", "path ", path, ";%path%&& ",
- command, NULL);
- }
- else {
- va_start(args, command);
- path = chaz_Util_vjoin(":", args);
- va_end(args);
-
- lib_command = chaz_Util_join("", "PATH=", path, ":$$PATH ",
- command, NULL);
- }
-
- free(path);
- }
- else {
- /* Assume that library paths are compiled into the executable on
- * Darwin.
- */
- lib_command = chaz_Util_strdup(command);
- }
-
- chaz_MakeRule_add_command(self, lib_command);
- free(lib_command);
-}
-
-void
chaz_MakeRule_add_rm_command(chaz_MakeRule *self, const char *files) {
char *command;