Skip to content

Commit f1a14d8

Browse files
asfernandesasfernandes
committed
Fix problem with CLIENT_BUILD requiring btyacc's generated files present.
1 parent 8b934a3 commit f1a14d8

15 files changed

+750
-671
lines changed

‎builds/posix/make.shared.targets

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
# MOD 07-Oct-2002
4141

4242
# This rule creates parse.cpp from parse.y
43-
44-
$(OBJ)/dsql/parse.cpp: $(SRC_ROOT)/include/gen/parse.h
45-
$(OBJ)/dsql/parse.cpp $(SRC_ROOT)/include/gen/parse.h: $(SRC_ROOT)/dsql/parse.y $(SRC_ROOT)/dsql/btyacc_fb.ske
43+
# Use percent so make understand that the command generates both files.
44+
# With make 4.3 this can be replaced by group target (&:) feature.
45+
$(OBJ)/dsql/parse%cpp $(SRC_ROOT)/include/gen/parse%h: $(SRC_ROOT)/dsql/parse.y $(SRC_ROOT)/dsql/btyacc_fb.ske
4646
sed -n '/%type .*/p' < $< > $(GEN_ROOT)/types.y
4747
sed 's/%type .*//' < $< > $(GEN_ROOT)/y.y
4848
($(BTYACC) -l -d -S $(SRC_ROOT)/dsql/btyacc_fb.ske $(GEN_ROOT)/y.y; echo $$? > $(GEN_ROOT)/y.status) 2>&1 | tee $(GEN_ROOT)/y.txt
@@ -62,7 +62,7 @@ $(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp
6262

6363

6464
# Explicit dependence on generated header (parser)
65-
$(OBJ)/dsql/Parser.o $(OBJ)/common/keywords.o $(OBJ)/dsql/dsql.o: $(SRC_ROOT)/include/gen/parse.h
65+
$(OBJ)/dsql/Parser.o $(OBJ)/dsql/Keywords.o $(OBJ)/dsql/dsql.o: $(SRC_ROOT)/include/gen/parse.h
6666

6767
# Special cases for building cpp from epp
6868
$(OBJ)/dsql/metd.cpp: $(SRC_ROOT)/dsql/metd.epp

‎builds/win32/msvc15/common.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
<ClCompile Include="..\..\..\src\common\isc.cpp" />
7676
<ClCompile Include="..\..\..\src\common\isc_file.cpp" />
7777
<ClCompile Include="..\..\..\src\common\isc_sync.cpp" />
78-
<ClCompile Include="..\..\..\src\common\keywords.cpp" />
7978
<ClCompile Include="..\..\..\src\common\MsgMetadata.cpp" />
8079
<ClCompile Include="..\..\..\src\common\MsgUtil.cpp" />
8180
<ClCompile Include="..\..\..\src\common\os\win32\fbsyslog.cpp" />
@@ -189,7 +188,6 @@
189188
<ClInclude Include="..\..\..\src\common\isc_f_proto.h" />
190189
<ClInclude Include="..\..\..\src\common\isc_proto.h" />
191190
<ClInclude Include="..\..\..\src\common\isc_s_proto.h" />
192-
<ClInclude Include="..\..\..\src\common\keywords.h" />
193191
<ClInclude Include="..\..\..\src\common\MsgMetadata.h" />
194192
<ClInclude Include="..\..\..\src\common\MsgUtil.h" />
195193
<ClInclude Include="..\..\..\src\common\os\divorce.h" />
@@ -199,6 +197,7 @@
199197
<ClInclude Include="..\..\..\src\common\os\mod_loader.h" />
200198
<ClInclude Include="..\..\..\src\common\os\os_utils.h" />
201199
<ClInclude Include="..\..\..\src\common\os\path_utils.h" />
200+
<ClInclude Include="..\..\..\src\common\ParserTokens.h" />
202201
<ClInclude Include="..\..\..\src\common\prett_proto.h" />
203202
<ClInclude Include="..\..\..\src\common\ScanDir.h" />
204203
<ClInclude Include="..\..\..\src\common\sdl.h" />
@@ -218,6 +217,7 @@
218217
<ClInclude Include="..\..\..\src\common\ThreadStart.h" />
219218
<ClInclude Include="..\..\..\src\common\TimeZones.h" />
220219
<ClInclude Include="..\..\..\src\common\TimeZoneUtil.h" />
220+
<ClInclude Include="..\..\..\src\common\Token.h" />
221221
<ClInclude Include="..\..\..\src\common\Tokens.h" />
222222
<ClInclude Include="..\..\..\src\common\unicode_util.h" />
223223
<ClInclude Include="..\..\..\src\common\UtilSvc.h" />

‎builds/win32/msvc15/common.vcxproj.filters

+6-6
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,6 @@
243243
<ClCompile Include="..\..\..\src\common\classes\ParsedList.cpp">
244244
<Filter>classes</Filter>
245245
</ClCompile>
246-
<ClCompile Include="..\..\..\src\common\keywords.cpp">
247-
<Filter>common</Filter>
248-
</ClCompile>
249246
<ClCompile Include="..\..\..\src\common\Int128.cpp">
250247
<Filter>common</Filter>
251248
</ClCompile>
@@ -581,6 +578,9 @@
581578
<ClInclude Include="..\..\..\src\common\classes\BlobWrapper.h">
582579
<Filter>headers</Filter>
583580
</ClInclude>
581+
<ClInclude Include="..\..\..\src\common\ParserTokens.h">
582+
<Filter>headers</Filter>
583+
</ClInclude>
584584
<ClInclude Include="..\..\..\src\common\sha2\sha2.h">
585585
<Filter>headers</Filter>
586586
</ClInclude>
@@ -599,15 +599,15 @@
599599
<ClInclude Include="..\..\..\src\common\classes\ParsedList.h">
600600
<Filter>headers</Filter>
601601
</ClInclude>
602-
<ClInclude Include="..\..\..\src\common\keywords.h">
603-
<Filter>headers</Filter>
604-
</ClInclude>
605602
<ClInclude Include="..\..\..\src\common\Int128.h">
606603
<Filter>headers</Filter>
607604
</ClInclude>
608605
<ClInclude Include="..\..\..\src\common\Task.h">
609606
<Filter>headers</Filter>
610607
</ClInclude>
608+
<ClInclude Include="..\..\..\src\common\Token.h">
609+
<Filter>headers</Filter>
610+
</ClInclude>
611611
<ClInclude Include="..\..\..\src\common\classes\TimerImpl.h">
612612
<Filter>headers</Filter>
613613
</ClInclude>

‎builds/win32/msvc15/engine_static.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<ClCompile Include="..\..\..\src\dsql\errd.cpp" />
4848
<ClCompile Include="..\..\..\src\dsql\ExprNodes.cpp" />
4949
<ClCompile Include="..\..\..\src\dsql\gen.cpp" />
50+
<ClCompile Include="..\..\..\src\dsql\Keywords.cpp" />
5051
<ClCompile Include="..\..\..\src\dsql\make.cpp" />
5152
<ClCompile Include="..\..\..\src\dsql\movd.cpp" />
5253
<ClCompile Include="..\..\..\src\dsql\parse.cpp" />
@@ -201,6 +202,7 @@
201202
<ClInclude Include="..\..\..\src\dsql\errd_proto.h" />
202203
<ClInclude Include="..\..\..\src\dsql\ExprNodes.h" />
203204
<ClInclude Include="..\..\..\src\dsql\gen_proto.h" />
205+
<ClInclude Include="..\..\..\src\dsql\Keywords.h" />
204206
<ClInclude Include="..\..\..\src\dsql\make_proto.h" />
205207
<ClInclude Include="..\..\..\src\dsql\metd_proto.h" />
206208
<ClInclude Include="..\..\..\src\dsql\movd_proto.h" />

‎builds/win32/msvc15/engine_static.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@
156156
<ClCompile Include="..\..\..\src\dsql\gen.cpp">
157157
<Filter>DSQL</Filter>
158158
</ClCompile>
159+
<ClCompile Include="..\..\..\src\dsql\Keywords.cpp">
160+
<Filter>DSQL</Filter>
161+
</ClCompile>
159162
<ClCompile Include="..\..\..\src\dsql\make.cpp">
160163
<Filter>DSQL</Filter>
161164
</ClCompile>
@@ -587,6 +590,9 @@
587590
<ClInclude Include="..\..\..\src\dsql\gen_proto.h">
588591
<Filter>Header files</Filter>
589592
</ClInclude>
593+
<ClInclude Include="..\..\..\src\dsql\Keywords.h">
594+
<Filter>Header files</Filter>
595+
</ClInclude>
590596
<ClInclude Include="..\..\..\src\dsql\make_proto.h">
591597
<Filter>Header files</Filter>
592598
</ClInclude>

0 commit comments

Comments
 (0)