From e0f1ccd7725f241f314a6ceb63eb7b176acedb5b Mon Sep 17 00:00:00 2001
From: blueloveTH <blueloveTH@foxmail.com>
Date: Sun, 9 Jul 2023 02:17:30 +0800
Subject: [PATCH] ...

---
 .github/workflows/main.yml | 8 ++++----
 .gitignore                 | 2 +-
 CMakeLists.txt             | 8 ++++----
 run_profile.sh             | 2 +-
 scripts/run_tests.py       | 4 ++--
 src2/main.cpp              | 8 +++-----
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 74502865..f03cb4c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,9 +14,9 @@ jobs:
         cd build
         cmake ..
         cmake --build . --config Release
-        cp Release/pocketpy.exe ../output/windows/x86_64
+        cp Release/main.exe ../output/windows/x86_64
         cp Release/pocketpy.dll ../output/windows/x86_64
-        cp Release/pocketpy.exe ../
+        cp Release/main.exe ../
     - uses: actions/upload-artifact@v3
       with:
         path: output
@@ -51,9 +51,9 @@ jobs:
         cd build
         cmake ..
         cmake --build . --config Release
-        cp pocketpy ../output/linux/x86_64
+        cp main ../output/linux/x86_64
         cp libpocketpy.so ../output/linux/x86_64
-        cp pocketpy ../
+        cp main ../
     - uses: actions/upload-artifact@v3
       with:
         path: output
diff --git a/.gitignore b/.gitignore
index 0e27b9dc..d33a5917 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@ include/pocketpy/_generated.h
 profile.sh
 test
 src/httplib.h
-pocketpy.exe
+main.exe
 main.obj
 pocketpy.exp
 pocketpy.lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ca14b84..50fe4da4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,10 +48,10 @@ elseif(PK_BUILD_STATIC_LIB)
     add_library(${PROJECT_NAME} STATIC ${POCKETPY_SRC} ${PK_LIB_CPP})
 else()
     add_library(${PROJECT_NAME} SHARED ${POCKETPY_SRC} ${PK_LIB_CPP})
-    add_executable(${PROJECT_NAME}_EXE src2/main.cpp)
-    set_target_properties(${PROJECT_NAME}_EXE PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
-    target_link_libraries(${PROJECT_NAME}_EXE ${PROJECT_NAME})
-    target_link_libraries(${PROJECT_NAME}_EXE ${CMAKE_DL_LIBS})
+    set(PROJECT_EXE_NAME main)
+    add_executable(${PROJECT_EXE_NAME} src2/main.cpp)
+    target_link_libraries(${PROJECT_EXE_NAME} ${PROJECT_NAME})
+    target_link_libraries(${PROJECT_EXE_NAME} ${CMAKE_DL_LIBS})
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS})
\ No newline at end of file
diff --git a/run_profile.sh b/run_profile.sh
index d478a529..414d19e0 100644
--- a/run_profile.sh
+++ b/run_profile.sh
@@ -1,7 +1,7 @@
 python3 prebuild.py
 SRC=$(find src/ -name "*.cpp")
 clang++ -pg -O1 -std=c++17 -fno-rtti -stdlib=libc++ -Wfatal-errors -o pocketpy $SRC -Iinclude
-time ./pocketpy benchmarks/fib.py
+time ./main benchmarks/fib.py
 mv benchmarks/gmon.out .
 gprof pocketpy gmon.out > gprof.txt
 rm gmon.out
diff --git a/scripts/run_tests.py b/scripts/run_tests.py
index f533282c..54174faa 100644
--- a/scripts/run_tests.py
+++ b/scripts/run_tests.py
@@ -6,9 +6,9 @@ def test_file(filepath, cpython=False):
     if cpython:
         return os.system("python3 " + filepath) == 0
     if sys.platform == 'win32':
-        return os.system("pocketpy.exe " + filepath) == 0
+        return os.system("main.exe " + filepath) == 0
     else:
-        return os.system("./pocketpy " + filepath) == 0
+        return os.system("./main " + filepath) == 0
 
 def test_dir(path):
     print("Testing directory:", path)
diff --git a/src2/main.cpp b/src2/main.cpp
index c968adc7..ce418edb 100644
--- a/src2/main.cpp
+++ b/src2/main.cpp
@@ -7,16 +7,14 @@ std::string f_input(){
     return pkpy::platform_getline();
 }
 
-#define ABS_PATH(x) std::filesystem::absolute(x).c_str()
-
 int main(int argc, char** argv){
 #if _WIN32
     SetConsoleOutputCP(CP_UTF8);
-    void* p = LoadLibraryA(ABS_PATH("pocketpy.dll"));
+    void* p = LoadLibraryA("pocketpy.dll");
 #elif __linux__
-    void* p = dlopen(ABS_PATH("libpocketpy.so"), RTLD_NOW | RTLD_GLOBAL);
+    void* p = dlopen("libpocketpy.so", RTLD_NOW | RTLD_GLOBAL);
 #elif __APPLE__
-    void* p = dlopen(ABS_PATH("libpocketpy.dylib"), RTLD_NOW | RTLD_GLOBAL);
+    void* p = dlopen("libpocketpy.dylib", RTLD_NOW | RTLD_GLOBAL);
 #endif
     if(p == nullptr){
         std::cerr << "unable to load dynamic library" << std::endl;