Skip to content

WIP : make OF works when installed in a directory with spaces #6672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
oxillo wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

WIP : make OF works when installed in a directory with spaces #6672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5820487
core: create testcase
oxillo Jan 24, 2021
8a24876
core: define space-escaped functions
oxillo Jan 24, 2021
2bf45a6
core: make space-friendly call to tools (CC,AR)
oxillo Jan 24, 2021
313df34
core: making APPNAME space-friendly
oxillo Jan 24, 2021
b16a10b
core: make debug output space-friendly
oxillo Jan 24, 2021
3764b9c
core: compile test app 'issue 3160'
oxillo Jan 24, 2021
2738897
core: make shared function available before use
oxillo Jan 24, 2021
14b0b93
CI: build with space in OF_ROOT
oxillo Jan 24, 2021
d25a03c
ci: makescripts space friendly
oxillo Jan 25, 2021
c3f2d42
ci: makescripts space friendly
oxillo Jan 25, 2021
f058c39
ci: make scripts space friendly
oxillo Jan 25, 2021
00387f4
ci: make scripts space friendly
oxillo Jan 25, 2021
6211a80
ci: fix problem with addons
oxillo Jan 26, 2021
973c753
ci: manage space consistenly in compiler_flags
oxillo Jan 27, 2021
23a02e2
Merge remote-tracking branch 'remotes/upstream/master' into FIX-space…
oxillo Apr 1, 2021
015fc05
fix for realpath not available on OSX
oxillo Apr 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/build-msys2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
shell: msys2 {0}
steps:
- uses: actions/checkout@v2
with:
path: 'open Frameworks'
- uses: msys2/setup-msys2@v2
with:
update: true
Expand All @@ -29,14 +31,20 @@ jobs:
rsync
wget
- name: Install dependencies
run: ./scripts/ci/msys2/install.sh
run: |
cd "${GITHUB_WORKSPACE}/open Frameworks"
./scripts/ci/msys2/install.sh
env:
MSYSTEM: ${{ matrix.mingw }}
- name: Build
run: ./scripts/ci/msys2/build.sh
run: |
cd "${GITHUB_WORKSPACE}/open Frameworks"
./scripts/ci/msys2/build.sh
env:
MSYSTEM: ${{ matrix.mingw }}
- name: Run tests
run: ./scripts/ci/msys2/run_tests.sh
run: |
cd "${GITHUB_WORKSPACE}/open Frameworks"
./scripts/ci/msys2/run_tests.sh
env:
MSYSTEM: ${{ matrix.mingw }}
2 changes: 1 addition & 1 deletion apps/projectGenerator
Open in desktop
Submodule projectGenerator updated 15 files
+0 −26 .github/workflows/build-linux.yml
+0 −38 .github/workflows/build-macos.yml
+1 −1 commandLine/Project.xcconfig
+675 −4,333 commandLine/commandLine.xcodeproj/project.pbxproj
+1 −5 commandLine/openFrameworks-Info.plist
+1 −1 frontend/index.html
+0 −1 frontend/index.js
+435 −624 frontend/npm-shrinkwrap.json
+6 −6 frontend/package.json
+1 −6 ofxProjectGenerator/src/projects/xcodeProject.cpp
+0 −71 scripts/githubactions-id_rsa.enc
+9 −21 scripts/linux/buildPG.sh
+0 −18 scripts/osx/PG.entitlements
+3 −0 scripts/osx/_macOSTranslocationFix.command
+32 −79 scripts/osx/buildPG.sh
32 changes: 16 additions & 16 deletions libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@ endif
# OF_CORE_SOURCE_FILES $(patsubst $(OF_ROOT)/%.cpp,%.d,$(OF_CORE_SOURCE_FILES))
# 2. Add the OF_CORE_OBJ_OUTPUT_PATH as a prefix
# $(addprefix $(OF_CORE_OBJ_OUTPUT_PATH), ...)
OF_CORE_DEPENDENCY_FILES = $(addprefix $(OF_CORE_OBJ_OUTPUT_PATH),$(patsubst $(OF_ROOT)/%.cpp,%.d,$(patsubst $(OF_ROOT)/%.mm,%.d,$(patsubst $(OF_ROOT)/%.m,%.d,$(OF_CORE_SOURCE_FILES)))))
OF_CORE_DEPENDENCY_FILES = $(call esp-addprefix,$(OF_CORE_OBJ_OUTPUT_PATH),$(call esp-patsubst,$(OF_ROOT)/%.cpp,%.d, $(call esp-patsubst,$(OF_ROOT)/%.mm,%.d, $(call esp-patsubst,$(OF_ROOT)/%.m,%.d,$(OF_CORE_SOURCE_FILES)))))

# create a named list of object files
# 1. create a list of object files based on the current list of
# OF_CORE_SOURCE_FILES $(patsubst $(OF_ROOT)/%.cpp,%.o,$(OF_CORE_SOURCE_FILES)
# 2. Add the OF_CORE_OBJ_OUTPUT_PATH as a prefix
# $(addprefix $(OF_CORE_OBJ_OUTPUT_PATH), ...)
OF_CORE_OBJ_FILES = $(addprefix $(OF_CORE_OBJ_OUTPUT_PATH),$(patsubst $(OF_ROOT)/%.cpp,%.o,$(patsubst $(OF_ROOT)/%.mm,%.o,$(patsubst $(OF_ROOT)/%.m,%.o,$(OF_CORE_SOURCE_FILES)))))
OF_CORE_OBJ_FILES = $(call esp-addprefix,$(OF_CORE_OBJ_OUTPUT_PATH),$(call esp-patsubst,$(OF_ROOT)/%.cpp,%.o, $(call esp-patsubst,$(OF_ROOT)/%.mm,%.o, $(call esp-patsubst,$(OF_ROOT)/%.m,%.o,$(OF_CORE_SOURCE_FILES)))))


################################################################################
Expand All @@ -185,10 +185,10 @@ ifdef MAKEFILE_DEBUG
$(info OF_CORE_OBJ_OUTPUT_PATH=$(OF_CORE_OBJ_OUTPUT_PATH))

$(info ---OF_CORE_DEPENDENCY_FILES---)
$(foreach v, $(OF_CORE_DEPENDENCY_FILES),$(info $(v)))
$(call esp-foreach-info,$(OF_CORE_DEPENDENCY_FILES))

$(info ---OF_CORE_OBJ_FILES---)
$(foreach v, $(OF_CORE_OBJ_FILES),$(info $(v)))
$(call esp-foreach-info,$(OF_CORE_OBJ_FILES))
endif


Expand Down Expand Up @@ -230,42 +230,42 @@ all:

$(OF_CORE_OBJ_OUTPUT_PATH).compiler_flags: force
@mkdir -p $(OF_CORE_OBJ_OUTPUT_PATH)
@if [ "$(strip $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS))" != "$(strip $$(cat $@ 2>/dev/null))" ]; then echo "Compiler flags have changed, recompiling"; echo "Old: $(strip $$(cat $@ 2>/dev/null))"; echo "New $(strip $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS))"; echo $(strip $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS))> $@; fi
@if [ "$(call esp2c,$(strip $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS)))" != "$(strip $$(cat "$@" 2>/dev/null))" ]; then echo "Compiler flags have changed, recompiling"; echo "Old: $(strip $$(cat "$@" 2>/dev/null))"; echo "New: $(call esp2c,$(strip $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS)))"; echo $(call esp2c,$(strip $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS)))> "$@"; fi


#This rule does the compilation
$(OF_CORE_OBJ_OUTPUT_PATH)%.o: $(OF_ROOT)/%.cpp $(OF_CORE_OBJ_OUTPUT_PATH).compiler_flags
@echo "Compiling" $<
@mkdir -p $(@D)
$(CXX) $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS) -MMD -MP -MF $(OF_CORE_OBJ_OUTPUT_PATH)$*.d -MT$(OF_CORE_OBJ_OUTPUT_PATH)$*.o -o $@ -c $<
@mkdir -p $(call esp-@D)
$(CXX) $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS) -MMD -MP -MF $(OF_CORE_OBJ_OUTPUT_PATH)$*.d -MT$(OF_CORE_OBJ_OUTPUT_PATH)$*.o -o "$@" -c "$<"

$(OF_CORE_OBJ_OUTPUT_PATH)%.o: $(OF_ROOT)/%.mm $(OF_CORE_OBJ_OUTPUT_PATH).compiler_flags
@echo "Compiling" $<
@mkdir -p $(@D)
$(CXX) $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS) -MMD -MP -MF $(OF_CORE_OBJ_OUTPUT_PATH)$*.d -MT$(OF_CORE_OBJ_OUTPUT_PATH)$*.o -o $@ -c $<
@mkdir -p $(call esp-@D)
$(CXX) $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS) -MMD -MP -MF $(OF_CORE_OBJ_OUTPUT_PATH)$*.d -MT$(OF_CORE_OBJ_OUTPUT_PATH)$*.o -o "$@" -c "$<"

$(OF_CORE_OBJ_OUTPUT_PATH)%.o: $(OF_ROOT)/%.m $(OF_CORE_OBJ_OUTPUT_PATH).compiler_flags
@echo "Compiling" $<
@mkdir -p $(@D)
$(CC) $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS) -MMD -MP -MF $(OF_CORE_OBJ_OUTPUT_PATH)$*.d -MT$(OF_CORE_OBJ_OUTPUT_PATH)$*.o -o $@ -c $<
@mkdir -p $(call esp-@D)
$(CC) $(OPTIMIZATION_CFLAGS) $(CFLAGS) $(CXXFLAGS) -MMD -MP -MF $(OF_CORE_OBJ_OUTPUT_PATH)$*.d -MT$(OF_CORE_OBJ_OUTPUT_PATH)$*.o -o "$@" -c "$<"

# this target does the linking of the library
# $(TARGET) : $(OF_CORE_OBJ_FILES) means that each of the items in the
# $(OF_CORE_OBJ_FILES) must be processed first
ifeq ($(SHAREDCORE),1)
$(TARGET) : $(OF_CORE_OBJ_FILES) $(OF_CORE_OBJ_OUTPUT_PATH).compiler_flags
@echo "Creating library " $(TARGET)
@mkdir -p $(@D)
$(CC) -shared $(OF_CORE_OBJ_FILES) -o $@
@mkdir -p $(call esp-@D)
$(CC) -shared $(OF_CORE_OBJ_FILES) -o "$@"
else ifeq ($(BYTECODECORE),1)
$(TARGET) : $(OF_CORE_OBJ_FILES) $(OF_CORE_OBJ_OUTPUT_PATH).compiler_flags
@echo "Creating library " $(TARGET)
@mkdir -p $(@D)
$(CC) $(OF_CORE_OBJ_FILES) -o $@
@mkdir -p $(call esp-@D)
$(CC) $(OF_CORE_OBJ_FILES) -o "$@"
else
$(TARGET) : $(OF_CORE_OBJ_FILES) $(OF_CORE_OBJ_OUTPUT_PATH).compiler_flags
@echo "Creating library " $(TARGET)
@mkdir -p $(@D)
@mkdir -p $(call esp-@D)
$(AR) ${ARFLAGS} "$@" $(OF_CORE_OBJ_FILES)
endif
-include $(OF_CORE_DEPENDENCY_FILES)
Expand Down
Loading