@@ -26,7 +26,6 @@ Makefile
26
26
logs
27
27
*.log
28
28
npm-debug.log*
29
- tmp-deps/
30
29
.for project.use where !optional
31
30
$(use.project)/
32
31
.endfor
94
93
95
94
BUILD_ROOT=`pwd`
96
95
cd ../../..
97
- rm -rf tmp-deps
98
- mkdir -p tmp-deps
96
+ # Note: here we go to parent directory that contains current project,
97
+ # so the checkout is nearby, same as expected for usual developer work
99
98
100
99
.for project.use where !optional & defined (use.repository)
101
100
# Check dependent projects
102
- BASE_PWD=${PWD}
103
- cd tmp-deps
104
101
if [ ! -d $(use.project) ]; then
105
102
echo "I: cloning $(use.repository) into `pwd`/$(use.project)..."
106
103
.# TODO: Should there be a use of "release" (git branch) like elsewhere?
107
104
git clone $QUIET $(use.repository) || exit
108
105
fi
109
106
if [ ! -f $(use.project)/builds/gyp/project.gyp ]; then
110
- .# Note: We removed tmp-deps before, so the checkout is assumed most-recent and clean
111
107
echo "E: `pwd`/$(use.project) out of date (builds/gyp/project.gyp missing)" >&2
112
108
exit 1
113
109
fi
114
- cd ${BASE_PWD}
115
110
116
111
.endfor
117
112
@@ -154,11 +149,12 @@ $(project.GENERATED_WARNING_HEADER:)
154
149
'target_name': '$(project.name)',
155
150
'sources': [
156
151
. for project.use where !optional
157
- . if file.exists ("../tmp-deps/$(use.project)/$(topdir)/binding.cc")
158
- '../../../tmp-deps/$(use.project)/$(topdir)/binding.cc',
152
+ .# Note: the file.exists() paths are relative to current project.xml during zproject regen
153
+ . if file.exists ("../$(use.project)/$(topdir)/binding.cc")
154
+ '../../../$(use.project)/$(topdir)/binding.cc',
159
155
. else
160
- . if !file.exists ("../tmp-deps/ $(use.project)")
161
- . abort "E: please checkout $(use.project) into ../../../tmp-deps/ $(use.project)"
156
+ . if !file.exists ("../$(use.project)")
157
+ . abort "E: please checkout $(use.project) into ../../../$(use.project)"
162
158
. endif
163
159
. endif
164
160
. endfor
@@ -167,7 +163,7 @@ $(project.GENERATED_WARNING_HEADER:)
167
163
'include_dirs': [
168
164
"<!(node -e \\"require('nan')\\")",
169
165
. for project.use where !optional
170
- '../../../tmp-deps/ $(use.project)/include',
166
+ '../../../$(use.project)/include',
171
167
. endfor
172
168
'../../include'
173
169
],
@@ -251,11 +247,11 @@ $(project.GENERATED_WARNING_HEADER:)
251
247
#define $(PROJECT.PREFIX)_BUILD_DRAFT_API
252
248
253
249
. for project.use where !optional
254
- . if file.exists ("../tmp-deps/ $(use.project)/$(topdir)/binding.h")
255
- #include "../../../tmp-deps/ $(use.project)/$(topdir)/binding.h"
250
+ . if file.exists ("../$(use.project)/$(topdir)/binding.h")
251
+ #include "../../../$(use.project)/$(topdir)/binding.h"
256
252
. else
257
- . if !file.exists ("../tmp-deps/ $(use.project)")
258
- . abort "E: please checkout $(use.project) into ../tmp-deps/ $(use.project)"
253
+ . if !file.exists ("../$(use.project)")
254
+ . abort "E: please checkout $(use.project) into ../$(use.project)"
259
255
. endif
260
256
. endif
261
257
. endfor
0 commit comments