Skip to content

Fix paths for projects when not relative to OF folder #332

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

Merged
ofTheo merged 9 commits into from
Apr 6, 2023
Merged

Fix paths for projects when not relative to OF folder #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67c637b
changes
dimitre Apr 4, 2023
b57b34d
revert Utils
dimitre Apr 4, 2023
15abbfc
tidy
dimitre Apr 4, 2023
f62dfeb
make 64bit PG for Windows
ofTheo Apr 4, 2023
47d443f
revert to 32bit
ofTheo Apr 4, 2023
999c7ab
fix config.make to use relative OF_ROOT if project is inside OF folde…
ofTheo Apr 6, 2023
fb721b3
update ci to latest (#334)
ofTheo Apr 6, 2023
3b3a862
Merge branch 'abs' of https://github.com/dimitre/projectGenerator int…
ofTheo Apr 6, 2023
2f9504b
fix relative paths for OF reference
ofTheo Apr 6, 2023
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
5 changes: 3 additions & 2 deletions .github/workflows/build-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ concurrency:

jobs:
build-linux:
runs-on: ubuntu-18.04
# runs-on: ubuntu-latest
runs-on: ubuntu-latest
strategy:
matrix:
cfg:
- {target: linux}
env:
TARGET: ${{matrix.cfg.target}}
steps:
- name: Install libunwind
run: sudo apt-get install libunwind-dev
- uses: actions/checkout@v3
- name: Build
run:
Expand Down
8 changes: 7 additions & 1 deletion ofxProjectGenerator/src/projects/baseProject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,13 @@ bool baseProject::save(){

//add the of root path
if( str.rfind("# OF_ROOT =", 0) == 0 ){
saveConfig << "OF_ROOT = " + getOFRoot() << endl;

auto path = getOFRoot();
if( projectDir.string().rfind(getOFRoot(),0) == 0 ){
path = getOFRelPath(projectDir);
}

saveConfig << "OF_ROOT = " << path << endl;
}
// replace this section with our external paths
else if( extSrcPaths.size() && str.rfind("# PROJECT_EXTERNAL_SOURCE_PATHS =", 0) == 0 ){
Expand Down
11 changes: 8 additions & 3 deletions ofxProjectGenerator/src/projects/xcodeProject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,15 @@ bool xcodeProject::createProjectFile(){

// make everything relative the right way.
string relRoot = getOFRelPathFS(projectDir).string();

projectDir = projectDir.lexically_normal();

//projectDir is always absolute at the moment
//so lets check if the projectDir is inside the OF folder - if it is not make the OF path absolute
if( projectDir.string().rfind(getOFRoot(),0) != 0 ){
relRoot = getOFRoot();
}
if (relRoot != "../../.."){

findandreplaceInTexfile(projectDir / projectName / ".xcodeproj/project.pbxproj", "../../..", relRoot);
findandreplaceInTexfile(projectDir / (projectName + ".xcodeproj/project.pbxproj"), "../../..", relRoot);
findandreplaceInTexfile(projectDir / "Project.xcconfig", "../../..", relRoot);
if( target == "osx" ){
findandreplaceInTexfile(projectDir / "Makefile", "../../..", relRoot);
Expand Down