[DISCUSSION] move OS related files out of platform specific folder #2601

ann0see · 2022-04-17T18:36:27Z

Short description of changes

DO NOT MERGE!

Context: Fixes an issue?
No. Just moves files out of the platform specific folders into src/res, libs/ or specific folders in src/.

Does this change need documentation? What needs to be documented and how?

Status of this Pull Request

Ready for discussion what we should do with the remaining files.

What is missing until this pull request can be merged?
Testing and discussion.

Checklist

I've verified that this Pull Request follows the general code principles
I tested my code and it does what I want
My code follows the style guide
I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
I've filled all the content above

ann0see · 2022-04-17T18:40:15Z

mac/Info-xcode.plist

 	<string>en</string>
 	<key>CFBundleIconFile</key>
-	<string>mainicon.icns</string>
+	<string>mainicon.icns</string> <!-- Hopefully, this should not need the path to the file since we include it via qmake -->


Needs to be verified.

The autobuild mac version is OK - at least no images are missing as far as I can tell

ann0see · 2022-04-17T18:41:02Z

Jamulus.pro

 CLANG_FORMAT_SOURCES = $$files(*.cpp, true) $$files(*.mm, true) $$files(*.h, true)
 CLANG_FORMAT_SOURCES = $$find(CLANG_FORMAT_SOURCES, ^\(android|ios|mac|linux|src|windows\)/)
-CLANG_FORMAT_SOURCES ~= s!^\(windows/\(nsProcess|ASIOSDK2\)/|src/res/qrc_resources\.cpp\)\S*$!!g
+CLANG_FORMAT_SOURCES ~= s!^\(libs/\(NSIS|ASIOSDK2\)/|src/res/qrc_resources\.cpp\)\S*$!!g


I thought that we already moved the ASIOSDK. Is that in a not-yet merged PR?

ann0see · 2022-05-16T21:05:46Z

@hoffie you requested this PR a while ago, and I think it makes sense discussing the moving of files. I'm not yet done fully with moving everything out, but I think it's a good start?

hoffie · 2022-05-19T20:45:35Z

I think the direction of the PR is fine. I haven't had a look at all details yet.

By remaing files you mean the following, right?

$ find android/ mac/ ios/ linux/ windows/ -type f
android/res/drawable-xhdpi/icon.png
android/res/drawable-mdpi/icon.png
android/res/drawable-xxxhdpi/icon.png
android/res/drawable-hdpi/icon.png
android/res/drawable-ldpi/icon.png
android/res/drawable-xxhdpi/icon.png
android/AndroidManifest.xml
mac/Info-make-legacy.plist
mac/Info-make.plist
mac/deploy_mac.sh
mac/Jamulus.entitlements
mac/Info-xcode.plist
ios/deploy_ios.sh
ios/Info.plist
linux/deploy_deb.sh
windows/deploy_windows.ps1
windows/installer.nsi

I don't have a good idea for those yet. Moving all build scripts to build/ or something would still leave some stuff. Would generic platform/ directory make sense to reduce the number of top level directories at least?

ann0see · 2022-05-21T05:39:06Z

Yes. Some of these files can easily be moved (.entitlements etc) but the build scripts?
I'm not sure if the windows build version creates a folder called build during compile time, so not sure...

ann0see

Another round...

ann0see · 2022-06-05T14:24:01Z

Jamulus.pro

        ICONSDIR_SVG = $$absolute_path($$ICONSDIR_SVG, $$PREFIX)
        icons_svg.path = $$ICONSDIR_SVG
-        icons_svg.files = distributions/jamulus.svg distributions/jamulus-server.svg
+        icons_svg.files = src/res/jamulus-icon-2020.svg src/res/jamulus-server-icon-2020.svg


I don't really like the name of this file (rather remove the 2020 and icon). Other files use it probably.

ann0see · 2022-06-05T14:24:31Z

linux/raspijamulus.sh

@@ -1,7 +1,7 @@
 #!/bin/bash


This should be tested again on a new device (ping corrados if this is merged)

ann0see · 2022-08-06T10:36:48Z

I think it might make sense to open separate PRs with only a few of these commits such that testing becomes easier…

ann0see · 2022-09-02T08:16:51Z

Ok. Now the most "dangerous" PRs are missing: images and distribution moving.

Related to: jamulussoftware#2601

ann0see · 2022-09-06T18:44:00Z

Closing since #2838 is the last one related to this PR.

Related to: jamulussoftware#2601

ann0see requested a review from hoffie April 17, 2022 18:36

ann0see marked this pull request as draft April 17, 2022 18:37

ann0see force-pushed the patch/moveOSFiles branch from 882864b to 3cfb705 Compare April 17, 2022 18:39

ann0see commented Apr 17, 2022

View reviewed changes

ann0see force-pushed the patch/moveOSFiles branch from dc3d474 to 19295e4 Compare April 18, 2022 16:45

ann0see force-pushed the patch/moveOSFiles branch 8 times, most recently from 36b3add to f1e51a8 Compare April 30, 2022 20:35

ann0see marked this pull request as ready for review May 15, 2022 06:45

ann0see force-pushed the patch/moveOSFiles branch from f1e51a8 to 54b3fcc Compare May 16, 2022 21:02

ann0see force-pushed the patch/moveOSFiles branch 4 times, most recently from 6e6a934 to e024cd4 Compare June 5, 2022 14:23

ann0see commented Jun 5, 2022

View reviewed changes

ann0see added 4 commits August 12, 2022 22:24

Move images to src/res

4193b38

Move NSIS files to libs\

7739aea

Move code files to src/

b1db08a

Move Linux distribution/ files to linux/

12d0ce1

ann0see force-pushed the patch/moveOSFiles branch from e024cd4 to 12d0ce1 Compare August 12, 2022 20:24

ann0see marked this pull request as draft August 29, 2022 17:38

This was referenced Aug 29, 2022

Refactoring: Move NSIS files to libs\ #2822

Merged

Refactoring: Move platform specific code files to src/ #2824

Merged

ann0see added a commit to ann0see/jamulus that referenced this pull request Sep 2, 2022

Refactoring: Move images to src/res

88b5785

Related to: jamulussoftware#2601

ann0see mentioned this pull request Sep 2, 2022

Refactoring: Move images to src/res (Windows and Mac) #2834

Merged

9 tasks

ann0see added a commit to ann0see/jamulus that referenced this pull request Sep 2, 2022

Refactoring: Move macOS and Windows images to src/res

70d69da

Related to: jamulussoftware#2601

ann0see added a commit to ann0see/jamulus that referenced this pull request Sep 4, 2022

Refactoring: Move macOS and Windows images to src/res

db82f60

Related to: jamulussoftware#2601

ann0see added a commit to ann0see/jamulus that referenced this pull request Sep 4, 2022

Refactoring: Move macOS and Windows images to src/res

314abce

Related to: jamulussoftware#2601

ann0see mentioned this pull request Sep 5, 2022

Refactoring: Move Linux distribution/ files to linux/ #2838

Merged

5 tasks

ann0see closed this Sep 6, 2022

ann0see deleted the patch/moveOSFiles branch September 6, 2022 18:44

ann0see added a commit to ann0see/jamulus that referenced this pull request Nov 9, 2022

Refactoring: Move macOS and Windows images to src/res

be4af89

Related to: jamulussoftware#2601

[DISCUSSION] move OS related files out of platform specific folder #2601

[DISCUSSION] move OS related files out of platform specific folder #2601

Uh oh!

Conversation

ann0see commented Apr 17, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Uh oh!

ann0see Apr 17, 2022

Choose a reason for hiding this comment

Uh oh!

ann0see Apr 30, 2022

Choose a reason for hiding this comment

Uh oh!

ann0see Apr 17, 2022

Choose a reason for hiding this comment

Uh oh!

ann0see commented May 16, 2022

Uh oh!

hoffie commented May 19, 2022

Uh oh!

ann0see commented May 21, 2022

Uh oh!

ann0see left a comment

Choose a reason for hiding this comment

Uh oh!

ann0see Jun 5, 2022

Choose a reason for hiding this comment

Uh oh!

ann0see Jun 5, 2022

Choose a reason for hiding this comment

Uh oh!

ann0see commented Aug 6, 2022

Uh oh!

ann0see commented Sep 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ann0see commented Sep 6, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ann0see commented Apr 17, 2022 •

edited

Loading

ann0see commented Sep 2, 2022 •

edited

Loading