Skip to content

Commit d82457b

Browse files
committed
- Normalize directory separators (converted to "/") to fix erroneous compile and link flags definitions after pkg-config invocation on windows.
- Extract populateSubDependencies function for clarity - Fix : parsing channel and repo type in packagedependencies - Documentation update
1 parent bcf0102 commit d82457b

File tree

4 files changed

+175
-167
lines changed

4 files changed

+175
-167
lines changed

bcom_arch_define.pri

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@
22

33
REMAKEN_INFO_SUFFIX=remakeninfo.txt
44
# For backward compatibility
5-
REMAKENDEPSROOTFOLDER=$$(BCOMDEVROOT)
5+
REMAKENDEPSROOTFOLDER = $$clean_path($$(BCOMDEVROOT))
66
!isEmpty(REMAKENDEPSROOTFOLDER) {
7-
REMAKENDEPSFOLDER=$${REMAKENDEPSROOTFOLDER}
7+
REMAKENDEPSFOLDER = $$clean_path($${REMAKENDEPSROOTFOLDER})
88
}
99
else { #new remaken behavior
1010
unix {
11-
REMAKENDEPSROOTFOLDER=$$(HOME)
11+
REMAKENDEPSROOTFOLDER = $$(HOME)
1212
}
1313

1414
win32 {
15-
REMAKENDEPSROOTFOLDER=$$(USERPROFILE)
15+
REMAKENDEPSROOTFOLDER = $$clean_path($$(USERPROFILE))
1616
isEmpty(REMAKENDEPSROOTFOLDER) {
17-
REMAKENDEPSROOTFOLDER=shell_path($$(HOMEDRIVE)$$(HOMEPATH))
17+
REMAKENDEPSROOTFOLDER = $$clean_path($$(HOMEDRIVE)$$(HOMEPATH))
1818
}
1919
}
2020

2121
# Read REMAKENDEVPROP qmake property
22-
REMAKENDEPSFOLDER=$$[REMAKENDEPSFOLDERPROP]
22+
REMAKENDEPSFOLDER = $$clean_path($$[REMAKENDEPSFOLDERPROP])
2323

2424
isEmpty(REMAKENDEPSFOLDER) { # REMAKENDEVPROP not defined in qmake's properties
2525
message("NO REMAKENDEPSFOLDERPROP defined in qmake : setting REMAKENDEPSFOLDER to " $${REMAKENDEPSROOTFOLDER}/.remaken/packages)
26-
REMAKENDEPSFOLDER=$${REMAKENDEPSROOTFOLDER}/.remaken/packages
26+
REMAKENDEPSFOLDER = $${REMAKENDEPSROOTFOLDER}/.remaken/packages
2727
}
2828
}
2929
message("REMAKENDEPSFOLDER Dependencies folder is set to " $${REMAKENDEPSFOLDER})

doc/builddefs-qmake.adoc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
Remaken meta-dependency tool documentation
1+
Remaken meta-dependency tool documentation
22

33
= Remaken packaging structure
4+
== Default behavior
5+
6+
== Package tree
7+
package_name/package_version/
8+
package_name-package_version_remakeninfo.txt (or libname ??)
9+
bcom-package_name.pc (should be renamed to remaken-*.pc ?)
10+
interfaces/
11+
lib/[arch]/[mode]/[config]/
12+
413

514
== Package metadata
615
An information file is created in the target package.
@@ -48,7 +57,7 @@ when identifier is not specified :
4857
- @repository_type is mandatory
4958

5059
when channel is not specified, it defaults to stable for conan dependencies.
51-
For b-com and github repositories, channel can be a combination of values from the remaken packaging manifest.
60+
For b-com and github repositories, channel can be a combination of values from the remaken packaging manifest.
5261
It is not used for other kind of repos.
5362

5463
options are directly forwarded to the underlying repository tool.
@@ -126,4 +135,4 @@ JUCEPLUGIN_PLUGINCODE="H2Sk"
126135
JUCEPLUGIN ...
127136
PRODUCTNAME, PRODUCTNAME_SHORT vs TARGET
128137

129-
= Cmake informations
138+
= Cmake informations

0 commit comments

Comments
 (0)