cory/tildefriends
5
6
Fork 2
Code Issues 28 Pull Requests Actions Releases 38 Wiki Activity

WIP: git submodules #45

Closed
tasiaiso wants to merge 21 commits from tasiaiso/tildefriends:submodules into main
pull from: tasiaiso/tildefriends:submodules
merge into: cory:main
Conversation 12 Commits 21 Files Changed 1523 +147 -547614
tasiaiso commented 2024-03-21 20:41:56 -04:00
Contributor
Copy Link

wip

todo:

  • lit
  • prettier (wip)
  • speedscope
  • sqlite
wip todo: - lit - prettier (wip) - speedscope - sqlite
tasiaiso added 14 commits 2024-03-21 20:41:56 -04:00
remove zlib bff231751e
add zlib as a submodule 3603ce5ba6
remove libsodium 9291de41d8
add libsodium as a submodule 758f177617
remove quickjs 4aa7424977
add quickjs as a submodule acae3e9562
remove crypt_blowfish a4b324127a
add crypt_blowfish as a submodule b8e5caba0d
remove libbacktrace 2a10d26215
add libbacktrace as a submodule 2d5417f7dc
remove libuv 1a5acca5cf
add libuv as a submodule b1c8b51377
remove picohttpparser 0272382e0e
add picohttpparser as a submodule 474e39c9c3
tasiaiso added 1 commit 2024-03-21 20:57:40 -04:00
remove some of the preinstalled dependencies (code_mirror, prettier) 3bd827a9f7
cory commented 2024-03-21 22:48:25 -04:00
Owner
Copy Link

Interesting. Does make dist still produce a tarball with enough dependencies to build?

Interesting. Does `make dist` still produce a tarball with enough dependencies to build?
tasiaiso added 1 commit 2024-03-22 05:02:14 -04:00
Merge branch 'main' into submodules 2b4265f9ee
tasiaiso commented 2024-03-22 07:18:42 -04:00
Author
Contributor
Copy Link

Should there be a copy of openssl at deps/openssl ? I see references to his in GNUMakefile, but it's not in the repo.

What are the tools/ssl-*binaries ?

I get this error when running make with the Android SDK, even though those binaries are there

[android_version] src/android/AndroidManifest.xml
make: tools/ssl-android: No such file or directory
make: *** [GNUmakefile:825: deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a] Error 127
make: *** Waiting for unfinished jobs....

What flavor and version of javac should the app be compiled with ?

Should there be a copy of openssl at deps/openssl ? I see references to his in GNUMakefile, but it's not in the repo. What are the `tools/ssl-*`binaries ? I get this error when running `make` with the Android SDK, even though those binaries are there ``` [android_version] src/android/AndroidManifest.xml make: tools/ssl-android: No such file or directory make: *** [GNUmakefile:825: deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a] Error 127 make: *** Waiting for unfinished jobs.... ``` What flavor and version of javac should the app be compiled with ?
cory commented 2024-03-22 08:08:03 -04:00
Owner
Copy Link

For Android and iOS where there aren't provided openssl libs, those scripts in tools fetch and build it. Not sure what's up with that error. Is it actually complaining about the shebang?

javac??? I'll check what I have in a bit.

For Android and iOS where there aren't provided openssl libs, those scripts in tools fetch and build it. Not sure what's up with that error. Is it actually complaining about the shebang? javac??? I'll check what I have in a bit.
cory commented 2024-03-22 08:33:00 -04:00
Owner
Copy Link

On one debian bookworm machine I see javac 17.0.10 coming from openjdk-17-jdk-headless.

On one debian bookworm machine I see `javac 17.0.10` coming from `openjdk-17-jdk-headless`.
tasiaiso added 5 commits 2024-03-22 15:26:09 -04:00
remove lit d1f87a8fb4
build(nix): test nix package 0965e90d7b
Merge branch 'nix_package' into submodules 658e7089be
android sdk, makefile changes 4c11667ebd
Merge branch 'submodules' of https://dev.tildefriends.net/tasiaiso/tildefriends into submodules e00f73e1d5
tasiaiso commented 2024-03-22 15:41:25 -04:00
Author
Contributor
Copy Link

I'm not familiar with makefiles yet and I just don't understand what this does

ANDROID_DEPS := deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a
$(ANDROID_DEPS):
	+@tools/ssl-android
$(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS)

Can you run make clean and make dist on this branch and get it to work ?

I'm not familiar with makefiles yet and I just don't understand what this does ``` ANDROID_DEPS := deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a $(ANDROID_DEPS): +@tools/ssl-android $(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS) ``` Can you run `make clean` and `make dist` on this branch and get it to work ?
cory commented 2024-03-25 12:46:37 -04:00
Owner
Copy Link

I'm definitely no makefile expert.

The goal of that block is just to run tools/ssl-android before attempting to build any of the android .o files.

ANDROID_DEPS is just set to an arbitrary file that is built as part of ssl. The + causes the call to make inside the script to re-use the outer make process. The filter is just generating a list of all the android .o targets, and the |turns it into an order-only dependency.

I stripped all the android/ios stuff from the dist target, and running make dist currently gives me:

find: ‘deps/codemirror/’: No such file or directory
find: ‘deps/lit/’: No such file or directory
[archive] dist/tildefriends-0.0.17-wip.tar.xz
fatal: not a valid object name: main
tar: This does not look like a tar archive
tar: Exiting with failure status due to previous errors
I'm definitely no makefile expert. The goal of that block is just to run `tools/ssl-android` before attempting to build any of the android .o files. ANDROID_DEPS is just set to an arbitrary file that is built as part of ssl. The `+` causes the call to `make` inside the script to re-use the outer `make` process. The filter is just generating a list of all the android `.o` targets, and the `|`turns it into an order-only dependency. I stripped all the android/ios stuff from the `dist` target, and running `make dist` currently gives me: ``` find: ‘deps/codemirror/’: No such file or directory find: ‘deps/lit/’: No such file or directory [archive] dist/tildefriends-0.0.17-wip.tar.xz fatal: not a valid object name: main tar: This does not look like a tar archive tar: Exiting with failure status due to previous errors ```
tasiaiso commented 2024-03-25 15:33:23 -04:00
Author
Contributor
Copy Link

Run make fetch ?

Run `make fetch` ?
cory commented 2024-03-25 18:16:26 -04:00
Owner
Copy Link

I don't have a make fetch? I saw your tools/install_dependencies.sh which addressed one of the errors.

I like this in concept, though I'd rather track the releases of possibly all these dependencies rather than latest.

It looks like I can do something like https://stackoverflow.com/questions/5482544/how-can-i-use-git-archive-to-include-submodules-from-a-bare-repository to meet my archiving desires.

I can plan to spend some time with this soon and get something into main.

I don't have a `make fetch`? I saw your `tools/install_dependencies.sh` which addressed one of the errors. I like this in concept, though I'd rather track the releases of possibly all these dependencies rather than latest. It looks like I can do something like https://stackoverflow.com/questions/5482544/how-can-i-use-git-archive-to-include-submodules-from-a-bare-repository to meet my archiving desires. I can plan to spend some time with this soon and get something into main.
tasiaiso commented 2024-03-26 16:53:33 -04:00
Author
Contributor
Copy Link

It's make fetchdeps sorry

GNUmakefile Line 812 in e00f73e1d5
fetchdeps:

I made that script before I knew that stuff was handled by make fetchdeps, it's hzeless now and I'll remove it later.

They are submodules, but I've pinned them to the commit that corresponds to the release that was installed before I touched anything. See b1c8b51377

To update a submodule you have to go in it's directory and checkout to the tag or the commit that you want.

It's `make fetchdeps` sorry https://dev.tildefriends.net/cory/tildefriends/src/commit/e00f73e1d517f5a1e022cc5b3d401b7b7243dc04/GNUmakefile#L812 I made that script before I knew that stuff was handled by `make fetchdeps`, it's hzeless now and I'll remove it later. They are submodules, but I've pinned them to the commit that corresponds to the release that was installed before I touched anything. See https://dev.tildefriends.net/cory/tildefriends/commit/b1c8b51377423a2c9e56f61017299e66aca32078 To update a submodule you have to go in it's directory and checkout to the tag or the commit that you want.
cory commented 2024-04-10 19:34:30 -04:00
Owner
Copy Link

Hope you don't mind - I manually redid the first bits of this so that I could understand the process: c5cb9979d3 and 7d182db32f.

Hope you don't mind - I manually redid the first bits of this so that I could understand the process: c5cb9979d39f1268b1c60b9a1d7417be68622615 and 7d182db32fa2e1d7ed689fd27714eae48cd24abf.
tasiaiso commented 2024-05-30 05:43:48 -04:00
Author
Contributor
Copy Link

@cory Can I close this ? Did you implement everything in this PR yourself ?

@cory Can I close this ? Did you implement everything in this PR yourself ?
cory commented 2024-05-30 12:12:03 -04:00
Owner
Copy Link

Yep, I think we've done everything that can be done from this for now. Closing. Thanks.

Yep, I think we've done everything that can be done from this for now. Closing. Thanks.
cory closed this pull request 2024-05-30 12:12:03 -04:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
cory
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: cory/tildefriends#45
No description provided.
Delete Branch "tasiaiso/tildefriends:submodules"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?