factor out config.sh script to update config files (VERSION, SYSCONFDIR) by MartinNowak · Pull Request #7036 · dlang/dmd

MartinNowak · 2017-07-26T18:27:48Z

use generated/dub as string import path for copied/generated config files

dlang-bot · 2017-07-26T18:27:49Z

Thanks for your pull request, @MartinNowak!

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

MartinNowak · 2017-07-26T18:28:14Z

FYI @jacob-carlborg

wilzbach · 2017-07-26T18:32:36Z

Could we first focus on re-enabling the Travis test?
WIP: #6999

jacob-carlborg · 2017-07-26T18:35:44Z

dub.sdl

-  // https://github.com/dlang/dub/issues/1199
-  dflags "-J$PACKAGE_DIR"
+  preGenerateCommands "\"$${DUB_PACKAGE_DIR}config.sh\" \"$${DUB_PACKAGE_DIR}generated/dub\" VERSION /etc"
+  stringImportPaths "generated/dub"


Will this work when building a package that has DMD as a dependency? I had problems with this before, that's why I switch from -J. to -J$PACKAGE_DIR.

Well there is a difference between passing raw paths directly to dmd and telling dub which subfolder to use in a package. And yes it will work since dub knows how to deal with relative paths for the latter.

Aha, ok. Using . does not work (at least not in this project). But other paths seem work.

No, . does exactly what you want.
I'm seeing a small issues with non-absolute arguments to dub --root=dmd build :lexer where dub tries to relate two relative paths.

dlang/dub#1207

No, . does exactly what you want.

I don't know how, but I got this error Invalid variable: DFLAGS when using a dot .. As you can see in dlang/dub#1199. For some reason I don't get this error anymore today 😕.

jacob-carlborg · 2017-07-26T18:46:38Z

dub.sdl

-  // stringImportPaths cannot be used because it will make Dub extremely slow
-  // https://github.com/dlang/dub/issues/1199
-  dflags "-J$PACKAGE_DIR"
+  preGenerateCommands "\"$${DUB_PACKAGE_DIR}config.sh\" \"$${DUB_PACKAGE_DIR}generated/dub\" VERSION /etc"


You can use backticks instead of quotes to avoid the need to escape the quotes.

jacob-carlborg · 2017-07-26T18:56:45Z

dub.sdl

-  // stringImportPaths cannot be used because it will make Dub extremely slow
-  // https://github.com/dlang/dub/issues/1199
-  dflags "-J$PACKAGE_DIR"
+  preGenerateCommands "\"$${DUB_PACKAGE_DIR}config.sh\" \"$${DUB_PACKAGE_DIR}generated/dub\" VERSION /etc"


Interesting, you're using one of the few undocumented environment variables 😃.

It's not documented, but quite accessible to anyone invoking env and using git grep (or just searching the project).
https://github.com/dlang/dub/blob/dafdc47d690c63d074e1b9ed57349fe2eaaabd2b/source/dub/generators/generator.d#L480-L519

How about you update the documentation https://github.com/dlang/dub-registry/blob/7f4f2300b93d7ebfce06d1989ca4c1a4a1758c79/views/inc.package_format.envvars.dt ;)?

MartinNowak · 2017-07-26T19:56:36Z

Could we first focus on re-enabling the Travis test?
WIP: #6999

It's somewhat unrelated and #6999 isn't quite ready yet.

jacob-carlborg · 2017-07-27T06:33:52Z

config.sh

@@ -0,0 +1,15 @@
+#/bin/sh


Missing the bang !.

Interesting that it still worked when being invoked from make and dub.

Yeah, but not from the shell. I got some really cryptic error message.

jacob-carlborg · 2017-07-27T06:36:26Z

config.sh

@@ -0,0 +1,15 @@
+#/bin/sh
+


Add some error handling, like set -e.

Done @jacob-carlborg

- use generated/dub as string import path for copied/generated config files

jacob-carlborg · 2017-07-27T12:24:51Z

LGTM 👌.

MartinNowak force-pushed the fixup_dub_package branch from 9868a72 to 7ca9c4c Compare July 26, 2017 18:29

jacob-carlborg reviewed Jul 26, 2017

View reviewed changes

MartinNowak force-pushed the fixup_dub_package branch 2 times, most recently from 13674bc to ab4a410 Compare July 26, 2017 19:10

jacob-carlborg suggested changes Jul 27, 2017

View reviewed changes

factor out config.sh script to update config files (VERSION, SYSCONFDIR)

09cc628

- use generated/dub as string import path for copied/generated config files

MartinNowak force-pushed the fixup_dub_package branch from ab4a410 to 09cc628 Compare July 27, 2017 11:56

PetarKirov approved these changes Jul 31, 2017

View reviewed changes

wilzbach approved these changes Jul 31, 2017

View reviewed changes

wilzbach added the Merge:auto-merge label Jul 31, 2017

dlang-bot merged commit 2fbbcd9 into dlang:master Jul 31, 2017

MartinNowak deleted the fixup_dub_package branch August 30, 2022 06:02

Uh oh!

Conversation

MartinNowak commented Jul 26, 2017

Uh oh!

dlang-bot commented Jul 26, 2017

Bugzilla references

Uh oh!

MartinNowak commented Jul 26, 2017

Uh oh!

wilzbach commented Jul 26, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MartinNowak commented Jul 26, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jacob-carlborg commented Jul 27, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Comments