3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename bambu-studio to orca-slicer

Browse source
This commit is contained in:
SoftFever 2023-03-10 18:53:25 +08:00
parent da61839e84
commit 3a80173533
14 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BuildLinux.sh
View file

@ -56,7 +56,7 @@ while getopts ":dsiuhgbr" opt; do
echo " -g: force gtk2 build" echo " -g: force gtk2 build"
echo " -b: build in debug mode" echo " -b: build in debug mode"
echo " -d: build deps (optional)" echo " -d: build deps (optional)"
echo " -s: build bambu-studio (optional)" echo " -s: build orca-slicer (optional)"
echo " -u: only update clock & dependency packets (optional and need sudo)" echo " -u: only update clock & dependency packets (optional and need sudo)"
echo " -r: skip free ram check (low ram compiling)" echo " -r: skip free ram check (low ram compiling)"
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'" echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
@ -73,7 +73,7 @@ then
echo " -g: force gtk2 build" echo " -g: force gtk2 build"
echo " -b: build in debug mode" echo " -b: build in debug mode"
echo " -d: build deps (optional)" echo " -d: build deps (optional)"
echo " -s: build bambu-studio (optional)" echo " -s: build orca-slicer (optional)"
echo " -u: only update clock & dependency packets (optional and need sudo)" echo " -u: only update clock & dependency packets (optional and need sudo)"
echo " -r: skip free ram check (low ram compiling)" echo " -r: skip free ram check (low ram compiling)"
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'" echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"

2
CMakeLists.txt
View file

@ -680,7 +680,7 @@ if(SLIC3R_BUILD_TESTS)
endif() endif()
if (NOT WIN32 AND NOT APPLE) if (NOT WIN32 AND NOT APPLE)
set(SLIC3R_APP_CMD "bambu-studio") set(SLIC3R_APP_CMD "orca-slicer")
configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY) configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
endif() endif()

6
Containerfile
View file

@ -1,10 +1,10 @@
# Build Bambu Slicer in a container # Build Bambu Slicer in a container
# #
# Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md): # Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md):
# rm -rf build; podman build . -t bambu-studio-builder && podman run --rm localhost/bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv # rm -rf build; podman build . -t orca-slicer-builder && podman run --rm localhost/orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
# #
# Troubleshooting the build container: # Troubleshooting the build container:
# podman run -it --name bambu-studio-builder localhost/bambu-studio-builder /bin/bash # podman run -it --name orca-slicer-builder localhost/orca-slicer-builder /bin/bash
# #
# Debugging the resulting AppImage: # Debugging the resulting AppImage:
# 1) Install `gdb` # 1) Install `gdb`
@ -13,7 +13,7 @@
# 3) Find related issue using backtrace output for clues and add backtrace to it on github # 3) Find related issue using backtrace output for clues and add backtrace to it on github
# #
# Docker alternative AppImage build syntax (use this if you can't install podman): # Docker alternative AppImage build syntax (use this if you can't install podman):
# rm -rf build; docker build . --file Containerfile -t bambu-studio-builder; docker run --rm bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv # rm -rf build; docker build . --file Containerfile -t orca-slicer-builder; docker run --rm orca-slicer-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
# #
# #
# TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work. # TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work.

2
Dockerfile
View file

@ -89,4 +89,4 @@ RUN [[ "$UID" != "0" ]] \
# Using an entrypoint instead of CMD because the binary # Using an entrypoint instead of CMD because the binary
# accepts several command line arguments. # accepts several command line arguments.
ENTRYPOINT ["/BambuStudio/build/package/bin/bambu-studio"] ENTRYPOINT ["/BambuStudio/build/package/bin/orca-slicer"]

12
build_win.bat
View file

@ -28,12 +28,12 @@
@ECHO deps-dirty - build deps without cleaning @ECHO deps-dirty - build deps without cleaning
@ECHO Default: %PS_STEPS_DEFAULT% @ECHO Default: %PS_STEPS_DEFAULT%
@ECHO -r -RUN Specifies what to perform at the run step: @ECHO -r -RUN Specifies what to perform at the run step:
@ECHO console - run and wait on bambu-studio-console.exe @ECHO console - run and wait on orca-slicer-console.exe
@ECHO custom - run and wait on your custom build/%PS_CUSTOM_RUN_FILE% @ECHO custom - run and wait on your custom build/%PS_CUSTOM_RUN_FILE%
@ECHO ide - open project in Visual Studio if not open (no wait) @ECHO ide - open project in Visual Studio if not open (no wait)
@ECHO none - run step does nothing @ECHO none - run step does nothing
@ECHO viewer - run bambu-gcodeviewer.exe (no wait) @ECHO viewer - run bambu-gcodeviewer.exe (no wait)
@ECHO window - run bambu-studio.exe (no wait) @ECHO window - run orca-slicer.exe (no wait)
@ECHO Default: none @ECHO Default: none
@ECHO -d -DESTDIR Deps destination directory @ECHO -d -DESTDIR Deps destination directory
@ECHO Warning: Changing destdir path will not delete the old destdir. @ECHO Warning: Changing destdir path will not delete the old destdir.
@ -246,11 +246,11 @@ FOR /F "tokens=2 delims=," %%I in (
@ECHO Running %PS_RUN% application... @ECHO Running %PS_RUN% application...
@REM icacls below is just a hack for file-not-found error handling @REM icacls below is just a hack for file-not-found error handling
IF "%PS_RUN%" EQU "console" ( IF "%PS_RUN%" EQU "console" (
icacls bambu-studio-console.exe >nul || GOTO :END icacls orca-slicer-console.exe >nul || GOTO :END
start /wait /b bambu-studio-console.exe start /wait /b orca-slicer-console.exe
) ELSE IF "%PS_RUN%" EQU "window" ( ) ELSE IF "%PS_RUN%" EQU "window" (
icacls bambu-studio.exe >nul || GOTO :END icacls orca-slicer.exe >nul || GOTO :END
start bambu-studio.exe start orca-slicer.exe
) ELSE IF "%PS_RUN%" EQU "viewer" ( ) ELSE IF "%PS_RUN%" EQU "viewer" (
icacls bambu-gcodeviewer.exe >nul || GOTO :END icacls bambu-gcodeviewer.exe >nul || GOTO :END
start bambu-gcodeviewer.exe start bambu-gcodeviewer.exe

2
cmake/modules/MacOSXBundleInfo.plist.in
View file

@ -11,7 +11,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string> <string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.bambulab.bambu-studio</string> <string>com.softfever3d.orca-slicer</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>

4
src/BambuStudio.cpp
View file

@ -367,7 +367,7 @@ int CLI::run(int argc, char **argv)
BOOST_LOG_TRIVIAL(info) << "index="<< index <<", arg is "<< argv[index] <<std::endl; BOOST_LOG_TRIVIAL(info) << "index="<< index <<", arg is "<< argv[index] <<std::endl;
int debug_argc = 5; int debug_argc = 5;
char *debug_argv[] = { char *debug_argv[] = {
"E:\work\projects\bambu_release\bamboo_slicer\build_debug\src\Debug\bambu-studio.exe", "E:\work\projects\bambu_release\bamboo_slicer\build_debug\src\Debug\orca-slicer.exe",
"--slice", "--slice",
"9", "9",
//"--load-settings", //"--load-settings",
@ -2473,7 +2473,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
boost::nowide::cout boost::nowide::cout
<< SLIC3R_APP_KEY <<"-"<< SLIC3R_VERSION << ":" << SLIC3R_APP_KEY <<"-"<< SLIC3R_VERSION << ":"
<< std::endl << std::endl
<< "Usage: bambu-studio [ OPTIONS ] [ file.3mf/file.stl ... ]" << std::endl << "Usage: orca-slicer [ OPTIONS ] [ file.3mf/file.stl ... ]" << std::endl
<< std::endl << std::endl
<< "OPTIONS:" << std::endl; << "OPTIONS:" << std::endl;
cli_misc_config_def.print_cli_help(boost::nowide::cout, false); cli_misc_config_def.print_cli_help(boost::nowide::cout, false);

8
src/CMakeLists.txt
View file

@ -118,8 +118,8 @@ endif (MINGW)
if (NOT WIN32 AND NOT APPLE) if (NOT WIN32 AND NOT APPLE)
# Binary name on unix like systems (Linux, Unix) # Binary name on unix like systems (Linux, Unix)
set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "bambu-studio") set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "orca-slicer")
set(SLIC3R_APP_CMD "bambu-studio") set(SLIC3R_APP_CMD "orca-slicer")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY)
endif () endif ()
@ -172,7 +172,7 @@ if (WIN32)
endif() endif()
target_compile_definitions(BambuStudio_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE) target_compile_definitions(BambuStudio_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
add_dependencies(BambuStudio_app_gui BambuStudio) add_dependencies(BambuStudio_app_gui BambuStudio)
set_target_properties(BambuStudio_app_gui PROPERTIES OUTPUT_NAME "bambu-studio") set_target_properties(BambuStudio_app_gui PROPERTIES OUTPUT_NAME "orca-slicer")
target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly) target_link_libraries(BambuStudio_app_gui PRIVATE boost_headeronly)
endif () endif ()
@ -220,7 +220,7 @@ else ()
if (APPLE AND NOT CMAKE_MACOSX_BUNDLE) if (APPLE AND NOT CMAKE_MACOSX_BUNDLE)
# On OSX, the name of the binary matches the name of the Application. # On OSX, the name of the binary matches the name of the Application.
add_custom_command(TARGET BambuStudio POST_BUILD add_custom_command(TARGET BambuStudio POST_BUILD
COMMAND ln -sf BambuStudio bambu-studio COMMAND ln -sf BambuStudio orca-slicer
WORKING_DIRECTORY "$<TARGET_FILE_DIR:BambuStudio>" WORKING_DIRECTORY "$<TARGET_FILE_DIR:BambuStudio>"
VERBATIM) VERBATIM)
else () else ()

2
src/platform/msw/BambuStudio.rc.in
View file

@ -13,7 +13,7 @@ PRODUCTVERSION @SLIC3R_VERSION@
VALUE "ProductVersion", "@SLIC3R_BUILD_ID@" VALUE "ProductVersion", "@SLIC3R_BUILD_ID@"
VALUE "InternalName", "@SLIC3R_APP_NAME@" VALUE "InternalName", "@SLIC3R_APP_NAME@"
VALUE "LegalCopyright", "Copyright(C) 2021-2023 Lunkuo All Rights Reserved" VALUE "LegalCopyright", "Copyright(C) 2021-2023 Lunkuo All Rights Reserved"
VALUE "OriginalFilename", "bambu-studio.exe" VALUE "OriginalFilename", "orca-slicer.exe"
} }
} }
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
src/platform/unix/BambuGcodeviewer.desktop
View file

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Bambu GCode viewer Name=Bambu GCode viewer
Exec=bambu-studio --gcodeviewer %F Exec=orca-slicer --gcodeviewer %F
Icon=BambuStudio-gcodeviewer Icon=BambuStudio-gcodeviewer
Terminal=false Terminal=false
Type=Application Type=Application

4
src/platform/unix/BambuStudio.desktop
View file

@ -2,11 +2,11 @@
Name=BambuStudio Name=BambuStudio
GenericName=3D Printing Software GenericName=3D Printing Software
Icon=BambuStudio Icon=BambuStudio
Exec=bambu-studio %F Exec=orca-slicer %F
Terminal=false Terminal=false
Type=Application Type=Application
MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf; MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
Categories=Graphics;3DGraphics;Engineering; Categories=Graphics;3DGraphics;Engineering;
Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
StartupNotify=false StartupNotify=false
StartupWMClass=bambu-studio StartupWMClass=orca-slicer

2
src/slic3r/GUI/DesktopIntegrationDialog.cpp
View file

@ -340,7 +340,7 @@ void DesktopIntegrationDialog::perform_desktop_integration()
"Categories=Graphics;3DGraphics;Engineering;\n" "Categories=Graphics;3DGraphics;Engineering;\n"
"Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA\n" "Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA\n"
"StartupNotify=false\n" "StartupNotify=false\n"
"StartupWMClass=bambu-studio\n", name_suffix, version_suffix, excutable_path); "StartupWMClass=orca-slicer\n", name_suffix, version_suffix, excutable_path);
std::string path = GUI::format("%1%/applications/BambuStudio%2%.desktop", target_dir_desktop, version_suffix); std::string path = GUI::format("%1%/applications/BambuStudio%2%.desktop", target_dir_desktop, version_suffix);
if (create_desktop_file(path, desktop_file)){ if (create_desktop_file(path, desktop_file)){

2
src/slic3r/GUI/Mouse3DHandlerMac.mm
View file

@ -202,7 +202,7 @@ void Mouse3DController::init()
// Registration is done either by 4letter constant (CFBundleSignature - obsolete // Registration is done either by 4letter constant (CFBundleSignature - obsolete
//and we dont have that) or Executable name in pascal string(first byte is string lenght). //and we dont have that) or Executable name in pascal string(first byte is string lenght).
//If no packets are recieved the name might be different - check cmake. If debugging try commenting //If no packets are recieved the name might be different - check cmake. If debugging try commenting
// set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "bambu-studio") // set_target_properties(BambuStudio PROPERTIES OUTPUT_NAME "orca-slicer")
clientID = RegisterConnexionClient( clientID = RegisterConnexionClient(
0, "\013BambuStudio", kConnexionClientModeTakeOver, kConnexionMaskAxis); 0, "\013BambuStudio", kConnexionClientModeTakeOver, kConnexionMaskAxis);
BOOST_LOG_TRIVIAL(info) << "3dx mac handler registered"; BOOST_LOG_TRIVIAL(info) << "3dx mac handler registered";

4
src/slic3r/Utils/Process.cpp
View file

@ -39,7 +39,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
wxString path; wxString path;
wxFileName::SplitPath(wxStandardPaths::Get().GetExecutablePath(), &path, nullptr, nullptr, wxPATH_NATIVE); wxFileName::SplitPath(wxStandardPaths::Get().GetExecutablePath(), &path, nullptr, nullptr, wxPATH_NATIVE);
path += "\\"; path += "\\";
path += (instance_type == NewSlicerInstanceType::Slicer) ? "bambu-studio.exe" : "bambu-gcodeviewer.exe"; path += (instance_type == NewSlicerInstanceType::Slicer) ? "orca-slicer.exe" : "bambu-gcodeviewer.exe";
std::vector<const wchar_t*> args; std::vector<const wchar_t*> args;
args.reserve(4); args.reserve(4);
args.emplace_back(path.wc_str()); args.emplace_back(path.wc_str());
@ -102,7 +102,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
std::string my_path; std::string my_path;
if (args.empty()) { if (args.empty()) {
// Binary path was not set to the AppImage in the Linux specific block above, call the application directly. // Binary path was not set to the AppImage in the Linux specific block above, call the application directly.
my_path = (bin_path.parent_path() / ((instance_type == NewSlicerInstanceType::Slicer) ? "bambu-studio" : "bambu-gcodeviewer")).string(); my_path = (bin_path.parent_path() / ((instance_type == NewSlicerInstanceType::Slicer) ? "orca-slicer" : "bambu-gcodeviewer")).string();
args.emplace_back(my_path.c_str()); args.emplace_back(my_path.c_str());
} }
std::string to_open; std::string to_open;