From Slav2.3py at outlook.com Tue Jul 15 07:40:26 2025 From: Slav2.3py at outlook.com (AIGenerated DarkElfHugeTits) Date: Tue, 15 Jul 2025 07:40:26 +0000 Subject: Send me the stuff Message-ID: Hello, pls send me the good stuff / Thx Skickat fr?n Outlook f?r iOS -------------- next part -------------- An HTML attachment was scrubbed... URL: From duke at openjdk.org Fri Jul 18 10:09:38 2025 From: duke at openjdk.org (J. Duke) Date: Fri, 18 Jul 2025 10:09:38 GMT Subject: RFR: Merge jdk:master [v2] In-Reply-To: References: Message-ID: > Hi all, > > this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch `jdk:master`that can **not** be merged into the branch `master`: > > The following file contains merge conflicts: > > - src/java.base/macosx/native/libjava/java_props_macosx.c > > All Committers in this [project](https://openjdk.org/census#mobile) have access to my [personal fork](https://github.com/openjdk-bots/mobile) and can therefore help resolve these merge conflicts (you may want to coordinate who should do this). > The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request. > The below commands should be run in a local clone of your [personal fork](https://wiki.openjdk.org/display/skara#Skara-Personalforks) of the [openjdk/mobile](https://github.com/openjdk/mobile) repository. > > > # Ensure target branch is up to date > $ git checkout master > $ git pull https://github.com/openjdk/mobile.git master > > # Fetch and checkout the branch for this pull request > $ git fetch https://github.com/openjdk-bots/mobile.git +9:openjdk-bot-9 > $ git checkout openjdk-bot-9 > > # Merge the target branch > $ git merge master > > > When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create a merge commit: > > > $ git add paths/to/files/with/conflicts > $ git commit -m 'Merge jdk:master' > > > > When you have created the merge commit, run the following command to push the merge commit to this pull request: > > > $ git push https://github.com/openjdk-bots/mobile.git openjdk-bot-9:9 > > > _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly. > > Thanks, > J. Duke J. Duke has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains 13984 additional commits since the last revision: - Merge jdk:master - Automatic merge of jdk:master into master - Automatic merge of jdk:master into master - Automatic merge of jdk:master into master - Automatic merge of jdk:master into master - Automatic merge of jdk:master into master - Automatic merge of jdk:master into master - Automatic merge of jdk:master into master - Automatic merge of jdk:master into master - Automatic merge of jdk:master into master - ... and 13974 more: https://git.openjdk.org/mobile/compare/8df6b2c4...9e07bc61 ------------- Changes: - all: https://git.openjdk.org/mobile/pull/37/files - new: https://git.openjdk.org/mobile/pull/37/files/8df6b2c4..9e07bc61 Webrevs: - full: https://webrevs.openjdk.org/?repo=mobile&pr=37&range=01 - incr: https://webrevs.openjdk.org/?repo=mobile&pr=37&range=00-01 Stats: 228 lines in 43 files changed: 198 ins; 0 del; 30 mod Patch: https://git.openjdk.org/mobile/pull/37.diff Fetch: git fetch https://git.openjdk.org/mobile.git pull/37/head:pull/37 PR: https://git.openjdk.org/mobile/pull/37 From duke at openjdk.org Fri Jul 18 10:09:39 2025 From: duke at openjdk.org (J. Duke) Date: Fri, 18 Jul 2025 10:09:39 GMT Subject: Integrated: Merge jdk:master In-Reply-To: References: Message-ID: On Thu, 26 Jun 2025 13:37:35 GMT, J. Duke wrote: > Hi all, > > this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch `jdk:master`that can **not** be merged into the branch `master`: > > The following file contains merge conflicts: > > - src/java.base/macosx/native/libjava/java_props_macosx.c > > All Committers in this [project](https://openjdk.org/census#mobile) have access to my [personal fork](https://github.com/openjdk-bots/mobile) and can therefore help resolve these merge conflicts (you may want to coordinate who should do this). > The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request. > The below commands should be run in a local clone of your [personal fork](https://wiki.openjdk.org/display/skara#Skara-Personalforks) of the [openjdk/mobile](https://github.com/openjdk/mobile) repository. > > > # Ensure target branch is up to date > $ git checkout master > $ git pull https://github.com/openjdk/mobile.git master > > # Fetch and checkout the branch for this pull request > $ git fetch https://github.com/openjdk-bots/mobile.git +9:openjdk-bot-9 > $ git checkout openjdk-bot-9 > > # Merge the target branch > $ git merge master > > > When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create a merge commit: > > > $ git add paths/to/files/with/conflicts > $ git commit -m 'Merge jdk:master' > > > > When you have created the merge commit, run the following command to push the merge commit to this pull request: > > > $ git push https://github.com/openjdk-bots/mobile.git openjdk-bot-9:9 > > > _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly. > > Thanks, > J. Duke This pull request has now been integrated. Changeset: 74043c66 Author: J. Duke Committer: Johan Vos URL: https://git.openjdk.org/mobile/commit/74043c66527560ff8e651fcbd84c773816aae59d Stats: 80 lines in 2 files changed: 41 ins; 13 del; 26 mod Merge ------------- PR: https://git.openjdk.org/mobile/pull/37 From johan.vos at gluonhq.com Tue Jul 22 09:18:21 2025 From: johan.vos at gluonhq.com (Johan Vos) Date: Tue, 22 Jul 2025 11:18:21 +0200 Subject: java_home versus user_home Message-ID: Hi, I believe I made a mistake in ce70629f4394184ba517fb99c92ac9374ec8f37a [1] where I make java_home pointing to a user-controlled directory (user_home). The reason for this was to allow application developers to store the required modules and classes wherever they want. That requires them to copy the files somehow from the "app" and store them in the user_home However, I believe it is better to keep the modules/classfiles (or, later, aot'ed methods) within the app itself, so that there is a more standard location for it. Those resources need to be known at buildtime, and there is no need to copy them at runtime to a different location. This suggestion would revert the follow patch in os_bsd.cpp, in os::init_system_properties_values() #ifndef __IOS__ ... +#else + size_t nlen = strlen(user_home_dir) + 11; + char *iosuser_home = NEW_C_HEAP_ARRAY(char, nlen, mtInternal); + snprintf(iosuser_home, nlen, "%s/Documents", user_home_dir); + Arguments::set_java_home(iosuser_home); +#endif Unless someone disagrees, I'll file an issue and a PR for reverting this small change. Apart from my thinking that this is the right thing to do, another benefit is that it will bring the OpenJDK/mobile even more in sync with upstream. [1] https://github.com/openjdk/mobile/commit/ce70629f4394184ba517fb99c92ac9374ec8f37a#diff-1f93205c2e57bee432f8fb7a0725ba1dfdbe5b901ac63010ea0b43922e34ac12 - Johan -------------- next part -------------- An HTML attachment was scrubbed... URL: