Merge pull request #316 from naussika/main

HexGenerator: Fixes .hex file location for building on macOS/Linux
PokemonAutomation · Mar 10, 2023 · e6475a2 · e6475a2
2 parents c2421af + 7d43a4b
commit e6475a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/HexGenerator/Source/Tools/CommandRunner.cpp b/HexGenerator/Source/Tools/CommandRunner.cpp
@@ -128,20 +128,7 @@ int build_hexfile(
         });
         return 1;
     };
-    char buffer[262144];
-    std::string data;
-    std::string result;
-    int dist=0;
-    int size;
-
-    //TIME_START
-    while(!feof(pipe)) {
-        size=(int)fread(buffer,1,262144, pipe); //cout<<buffer<<" size="<<size<<endl;
-        data.resize(data.size()+size);
-        memcpy(&data[dist],buffer,size);
-        dist+=size;
-    }
-    //TIME_PRINT_
+
     int ret = pclose(pipe)/256;
     if (ret != 0) {
         std::string msg = "Build process exited with code: " + std::to_string(ret);

diff --git a/NativePrograms/Scripts/BuildOneUnix.sh b/NativePrograms/Scripts/BuildOneUnix.sh
@@ -53,6 +53,7 @@ rm $program.sym > /dev/null 2>&1
 rm $program.elf > /dev/null 2>&1
 
 # Also putting this behind the gui-wall
-if [[ $gui == "gui" ]]; then 
-      mv "$program.hex" "../$program-$board.hex"
+if [[ $gui == "gui" ]]; then
+      CATEGORY="$(basename ${PWD})" # hex_file = settings.path + m_category + "-" + m_name + ("-" + board + ".hex").c_str();
+      mv "$program.hex" "../../${CATEGORY}-$program-$board.hex"
 fi