Skip to content

Commit

Permalink
optimized
Browse files Browse the repository at this point in the history 
Signed-off-by: leleliu008 <leleliu008@gmail.com>
  • Loading branch information
@leleliu008
leleliu008 committed Dec 18, 2023
1 parent b6c8a97 commit 5a6afea
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 39 deletions.
19 changes: 10 additions & 9 deletions src/install.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4076,7 +4076,7 @@ static int ppkg_install_package(
/// below is for target ///
//////////////////////////////////////////////////////////////////////////////

const bool isCrossBuild = (strcmp(sysinfo->type, targetPlatform->name) == 0) && (strcmp(sysinfo->arch, targetPlatform->arch) == 0);
const bool isCrossBuild = !((strcmp(sysinfo->type, targetPlatform->name) == 0) && (strcmp(sysinfo->arch, targetPlatform->arch) == 0));

bool isTargetOSFreeBSD = false;
bool isTargetOSOpenBSD = false;
Expand All @@ -4093,12 +4093,13 @@ static int ppkg_install_package(
isTargetOSNetBSD = true;
ret = setup_sysroot_for__netbsd(targetPlatform, ppkgHomeDIR, ppkgHomeDIRLength, installOptions->logLevel >= PPKGLogLevel_verbose);
}
}

if (ret != PPKG_OK) {
return ret;
if (ret != PPKG_OK) {
return ret;
}
}

printf("isCrossBuild=%d\n",isCrossBuild);
//////////////////////////////////////////////////////////////////////////////

for (int i = 4; i < 8; i++) {
Expand Down Expand Up @@ -4374,8 +4375,8 @@ static int ppkg_install_package(
break;
}

if (unsetenv(cmakeenvs[i]) != 0) {
perror(cmakeenvs[i]);
if (unsetenv(name) != 0) {
perror(name);
return PPKG_ERROR;
}
}
Expand Down Expand Up @@ -5609,9 +5610,9 @@ int ppkg_setup_toolchain_for_native_build(
//////////////////////////////////////////////////////////////////////

const KV kvs[3] = {
{ "PROXIED_NATIVE_CC", toolchainForNativeBuild->cc },
{ "PROXIED_NATIVE_CXX", toolchainForNativeBuild->cxx },
{ "PROXIED_NATIVE_OBJC", toolchainForNativeBuild->objc == NULL ? toolchainForNativeBuild->cc : toolchainForNativeBuild->objc }
{ "PROXIED_CC_FOR_BUILD", toolchainForNativeBuild->cc },
{ "PROXIED_CXX_FOR_BUILD", toolchainForNativeBuild->cxx },
{ "PROXIED_OBJC_FOR_BUILD", toolchainForNativeBuild->objc == NULL ? toolchainForNativeBuild->cc : toolchainForNativeBuild->objc }
};

for (int i = 0; i < 3; i++) {
Expand Down
57 changes: 42 additions & 15 deletions src/ppkg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@ int ppkg_main(int argc, char* argv[]) {
int slashIndex = -1;

for (int i = 0; ;i++) {
if (argv[2][i] == '\0') {
break;
}
if (argv[2][i] == '/') {
slashIndex = i;
break;
Expand Down Expand Up @@ -598,17 +601,17 @@ int ppkg_main(int argc, char* argv[]) {
LOG_ERROR1("--jobs=<N> , <N> should be a non-empty string");
return PPKG_ERROR;
} else {
int i = 0;
int j = 0;

for (;;) {
char c = jobsStr[i];
char c = jobsStr[j];

if (c == '\0') {
break;
}

if ((c >= '0') && (c <= '9')) {
i++;
j++;
} else {
LOG_ERROR1("--jobs=<N> , <N> should be a integer.");
return PPKG_ERROR;
Expand Down Expand Up @@ -672,9 +675,12 @@ int ppkg_main(int argc, char* argv[]) {

int slashIndex = -1;

for (int i = 0; ;i++) {
if (package[i] == '/') {
slashIndex = i;
for (int j = 0; ;j++) {
if (package[j] == '\0') {
break;
}
if (package[j] == '/') {
slashIndex = j;
break;
}
}
Expand Down Expand Up @@ -906,9 +912,12 @@ int ppkg_main(int argc, char* argv[]) {

int slashIndex = -1;

for (int i = 0; ;i++) {
if (package[i] == '/') {
slashIndex = i;
for (int j = 0; ;j++) {
if (package[j] == '\0') {
break;
}
if (package[j] == '/') {
slashIndex = j;
break;
}
}
Expand Down Expand Up @@ -1135,9 +1144,12 @@ int ppkg_main(int argc, char* argv[]) {

int slashIndex = -1;

for (int i = 0; ;i++) {
if (package[i] == '/') {
slashIndex = i;
for (int j = 0; ;j++) {
if (package[j] == '\0') {
break;
}
if (package[j] == '/') {
slashIndex = j;
break;
}
}
Expand Down Expand Up @@ -1349,9 +1361,12 @@ int ppkg_main(int argc, char* argv[]) {

int slashIndex = -1;

for (int i = 0; ;i++) {
if (package[i] == '/') {
slashIndex = i;
for (int j = 0; ;j++) {
if (package[j] == '\0') {
break;
}
if (package[j] == '/') {
slashIndex = j;
break;
}
}
Expand Down Expand Up @@ -1809,6 +1824,9 @@ int ppkg_main(int argc, char* argv[]) {
int slashIndex = -1;

for (int i = 0; ;i++) {
if (argv[2][i] == '\0') {
break;
}
if (argv[2][i] == '/') {
slashIndex = i;
break;
Expand Down Expand Up @@ -1953,6 +1971,9 @@ int ppkg_main(int argc, char* argv[]) {
int slashIndex = -1;

for (int i = 0; ;i++) {
if (argv[2][i] == '\0') {
break;
}
if (argv[2][i] == '/') {
slashIndex = i;
break;
Expand Down Expand Up @@ -2316,6 +2337,9 @@ int ppkg_main(int argc, char* argv[]) {
int slashIndex = -1;

for (int i = 0; ;i++) {
if (argv[2][i] == '\0') {
break;
}
if (argv[2][i] == '/') {
slashIndex = i;
break;
Expand Down Expand Up @@ -2521,6 +2545,9 @@ int ppkg_main(int argc, char* argv[]) {
int slashIndex = -1;

for (int i = 0; ;i++) {
if (argv[2][i] == '\0') {
break;
}
if (argv[2][i] == '/') {
slashIndex = i;
break;
Expand Down
6 changes: 3 additions & 3 deletions wrapper-native-c++.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ int main(int argc, char* argv[]) {

/////////////////////////////////////////////////////////////////

char * const compiler = getenv("CXX_FOR_BUILD");
char * const compiler = getenv("PROXIED_CXX_FOR_BUILD");

if (compiler == NULL) {
fprintf(stderr, "CXX_FOR_BUILD environment variable is not set.\n");
fprintf(stderr, "PROXIED_CXX_FOR_BUILD environment variable is not set.\n");
return 1;
}

if (compiler[0] == '\0') {
fprintf(stderr, "CXX_FOR_BUILD environment variable value should be a non-empty string.\n");
fprintf(stderr, "PROXIED_CXX_FOR_BUILD environment variable value should be a non-empty string.\n");
return 2;
}

Expand Down
6 changes: 3 additions & 3 deletions wrapper-native-cc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ int main(int argc, char* argv[]) {

/////////////////////////////////////////////////////////////////

char * const compiler = getenv("CC_FOR_BUILD");
char * const compiler = getenv("PROXIED_CC_FOR_BUILD");

if (compiler == NULL) {
fprintf(stderr, "CC_FOR_BUILD environment variable is not set.\n");
fprintf(stderr, "PROXIED_CC_FOR_BUILD environment variable is not set.\n");
return 1;
}

if (compiler[0] == '\0') {
fprintf(stderr, "CC_FOR_BUILD environment variable value should be a non-empty string.\n");
fprintf(stderr, "PROXIED_CC_FOR_BUILD environment variable value should be a non-empty string.\n");
return 2;
}

Expand Down
6 changes: 3 additions & 3 deletions wrapper-native-objc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ int main(int argc, char* argv[]) {

/////////////////////////////////////////////////////////////////

char * const compiler = getenv("OBJC_FOR_BUILD");
char * const compiler = getenv("PROXIED_OBJC_FOR_BUILD");

if (compiler == NULL) {
fprintf(stderr, "OBJC_FOR_BUILD environment variable is not set.\n");
fprintf(stderr, "PROXIED_OBJC_FOR_BUILD environment variable is not set.\n");
return 1;
}

if (compiler[0] == '\0') {
fprintf(stderr, "OBJC_FOR_BUILD environment variable value should be a non-empty string.\n");
fprintf(stderr, "PROXIED_OBJC_FOR_BUILD environment variable value should be a non-empty string.\n");
return 2;
}

Expand Down
6 changes: 3 additions & 3 deletions wrapper-target-clang++.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ int main(int argc, char * argv[]) {

/////////////////////////////////////////////////////////////////

char * const clang = getenv("CXX");
char * const clang = getenv("PROXIED_CXX");

if (clang == NULL) {
fprintf(stderr, "CXX environment variable is not set.\n");
fprintf(stderr, "PROXIED_CXX environment variable is not set.\n");
return 1;
}

if (clang[0] == '\0') {
fprintf(stderr, "CXX environment variable value should be a non-empty string.\n");
fprintf(stderr, "PROXIED_CXX environment variable value should be a non-empty string.\n");
return 2;
}

Expand Down
6 changes: 3 additions & 3 deletions wrapper-target-clang.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ int main(int argc, char * argv[]) {

/////////////////////////////////////////////////////////////////

char * const clang = getenv("CC");
char * const clang = getenv("PROXIED_CC");

if (clang == NULL) {
fprintf(stderr, "CC environment variable is not set.\n");
fprintf(stderr, "PROXIED_CC environment variable is not set.\n");
return 1;
}

if (clang[0] == '\0') {
fprintf(stderr, "CC environment variable value should be a non-empty string.\n");
fprintf(stderr, "PROXIED_CC environment variable value should be a non-empty string.\n");
return 2;
}

Expand Down

0 comments on commit 5a6afea

Please sign in to comment.