Skip to content

Commit 58f324d

Browse files
nobunobu
committed
Update prism sources before dump_ast
1 parent 09a314d commit 58f324d

4 files changed

Lines changed: 29 additions & 23 deletions

File tree

‎common.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,8 +1327,8 @@ $(CROSS_COMPILING:no=)dump_ast$(BUILD_EXEEXT): $(tooldir)/dump_ast.c $(LIBPRISM_
13271327
$(ECHO) compiling $@
13281328
$(Q) $(CC) $(CFLAGS) $(OUTFLAG)$@ $(INCFLAGS) $(tooldir)/dump_ast.c $(LIBPRISM_OBJS)
13291329

1330-
build-tool/Makefile: $(tooldir)/dump_ast.mkmf.rb
1331-
+$(BASERUBY) -s $(tooldir)/dump_ast.mkmf.rb -make="$(MAKE)" build-tool $(tooldir)/dump_ast.c $(LIBPRISM_OBJS)
1330+
build-tool/Makefile: $(tooldir)/dump_ast.mkmf.rb prism-srcs prism-incs
1331+
+$(BASERUBY) -s $(tooldir)/dump_ast.mkmf.rb -make="$(MAKE)" build-tool $(tooldir)/dump_ast.c dump_ast.$(OBJEXT) $(LIBPRISM_OBJS)
13321332
$(CROSS_COMPILING:yes=)dump_ast$(BUILD_EXEEXT): build-tool/Makefile
13331333
cd build-tool && $(MAKE)
13341334

‎prism/srcs.mk‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,133 +23,136 @@ realclean-prism-srcs:: distclean-prism-srcs
2323

2424
realclean-srcs-local:: realclean-prism-srcs
2525

26-
main srcs: $(srcdir)/prism/api_node.c
26+
main srcs: prism-srcs
27+
main incs: prism-incs
28+
29+
prism-srcs: $(srcdir)/prism/api_node.c
2730
$(srcdir)/prism/api_node.c: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/ext/prism/api_node.c.erb
2831
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) ext/prism/api_node.c $@
2932

3033
realclean-prism-srcs::
3134
$(RM) $(srcdir)/prism/api_node.c
3235

33-
main incs: $(srcdir)/prism/ast.h
36+
prism-incs: $(srcdir)/prism/ast.h
3437
$(srcdir)/prism/ast.h: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/include/prism/ast.h.erb
3538
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) include/prism/ast.h $@
3639

3740
realclean-prism-srcs::
3841
$(RM) $(srcdir)/prism/ast.h
3942

40-
main incs: $(srcdir)/prism/internal/diagnostic.h
43+
prism-incs: $(srcdir)/prism/internal/diagnostic.h
4144
$(srcdir)/prism/internal/diagnostic.h: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/include/prism/internal/diagnostic.h.erb
4245
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) include/prism/internal/diagnostic.h $@
4346

4447
realclean-prism-srcs::
4548
$(RM) $(srcdir)/prism/internal/diagnostic.h
4649

47-
main srcs: $(srcdir)/lib/prism/compiler.rb
50+
prism-srcs: $(srcdir)/lib/prism/compiler.rb
4851
$(srcdir)/lib/prism/compiler.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/compiler.rb.erb
4952
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/compiler.rb $@
5053

5154
realclean-prism-srcs::
5255
$(RM) $(srcdir)/lib/prism/compiler.rb
5356

54-
main srcs: $(srcdir)/lib/prism/dispatcher.rb
57+
prism-srcs: $(srcdir)/lib/prism/dispatcher.rb
5558
$(srcdir)/lib/prism/dispatcher.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/dispatcher.rb.erb
5659
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/dispatcher.rb $@
5760

5861
realclean-prism-srcs::
5962
$(RM) $(srcdir)/lib/prism/dispatcher.rb
6063

61-
main srcs: $(srcdir)/lib/prism/dot_visitor.rb
64+
prism-srcs: $(srcdir)/lib/prism/dot_visitor.rb
6265
$(srcdir)/lib/prism/dot_visitor.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/dot_visitor.rb.erb
6366
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/dot_visitor.rb $@
6467

6568
realclean-prism-srcs::
6669
$(RM) $(srcdir)/lib/prism/dot_visitor.rb
6770

68-
main srcs: $(srcdir)/lib/prism/dsl.rb
71+
prism-srcs: $(srcdir)/lib/prism/dsl.rb
6972
$(srcdir)/lib/prism/dsl.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/dsl.rb.erb
7073
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/dsl.rb $@
7174

7275
realclean-prism-srcs::
7376
$(RM) $(srcdir)/lib/prism/dsl.rb
7477

75-
main srcs: $(srcdir)/lib/prism/inspect_visitor.rb
78+
prism-srcs: $(srcdir)/lib/prism/inspect_visitor.rb
7679
$(srcdir)/lib/prism/inspect_visitor.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/inspect_visitor.rb.erb
7780
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/inspect_visitor.rb $@
7881

7982
realclean-prism-srcs::
8083
$(RM) $(srcdir)/lib/prism/inspect_visitor.rb
8184

82-
main srcs: $(srcdir)/lib/prism/mutation_compiler.rb
85+
prism-srcs: $(srcdir)/lib/prism/mutation_compiler.rb
8386
$(srcdir)/lib/prism/mutation_compiler.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/mutation_compiler.rb.erb
8487
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/mutation_compiler.rb $@
8588

8689
realclean-prism-srcs::
8790
$(RM) $(srcdir)/lib/prism/mutation_compiler.rb
8891

89-
main srcs: $(srcdir)/lib/prism/node.rb
92+
prism-srcs: $(srcdir)/lib/prism/node.rb
9093
$(srcdir)/lib/prism/node.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/node.rb.erb
9194
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/node.rb $@
9295

9396
realclean-prism-srcs::
9497
$(RM) $(srcdir)/lib/prism/node.rb
9598

96-
main srcs: $(srcdir)/lib/prism/reflection.rb
99+
prism-srcs: $(srcdir)/lib/prism/reflection.rb
97100
$(srcdir)/lib/prism/reflection.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/reflection.rb.erb
98101
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/reflection.rb $@
99102

100103
realclean-prism-srcs::
101104
$(RM) $(srcdir)/lib/prism/reflection.rb
102105

103-
main srcs: $(srcdir)/lib/prism/serialize.rb
106+
prism-srcs: $(srcdir)/lib/prism/serialize.rb
104107
$(srcdir)/lib/prism/serialize.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/serialize.rb.erb
105108
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/serialize.rb $@
106109

107110
realclean-prism-srcs::
108111
$(RM) $(srcdir)/lib/prism/serialize.rb
109112

110-
main srcs: $(srcdir)/lib/prism/visitor.rb
113+
prism-srcs: $(srcdir)/lib/prism/visitor.rb
111114
$(srcdir)/lib/prism/visitor.rb: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/lib/prism/visitor.rb.erb
112115
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) lib/prism/visitor.rb $@
113116

114117
realclean-prism-srcs::
115118
$(RM) $(srcdir)/lib/prism/visitor.rb
116119

117-
main srcs: $(srcdir)/prism/diagnostic.c
120+
prism-srcs: $(srcdir)/prism/diagnostic.c
118121
$(srcdir)/prism/diagnostic.c: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/src/diagnostic.c.erb
119122
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) src/diagnostic.c $@
120123

121124
realclean-prism-srcs::
122125
$(RM) $(srcdir)/prism/diagnostic.c
123126

124-
main srcs: $(srcdir)/prism/json.c
127+
prism-srcs: $(srcdir)/prism/json.c
125128
$(srcdir)/prism/json.c: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/src/json.c.erb
126129
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) src/json.c $@
127130

128131
realclean-prism-srcs::
129132
$(RM) $(srcdir)/prism/json.c
130133

131-
main srcs: $(srcdir)/prism/node.c
134+
prism-srcs: $(srcdir)/prism/node.c
132135
$(srcdir)/prism/node.c: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/src/node.c.erb
133136
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) src/node.c $@
134137

135138
realclean-prism-srcs::
136139
$(RM) $(srcdir)/prism/node.c
137140

138-
main srcs: $(srcdir)/prism/prettyprint.c
141+
prism-srcs: $(srcdir)/prism/prettyprint.c
139142
$(srcdir)/prism/prettyprint.c: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/src/prettyprint.c.erb
140143
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) src/prettyprint.c $@
141144

142145
realclean-prism-srcs::
143146
$(RM) $(srcdir)/prism/prettyprint.c
144147

145-
main srcs: $(srcdir)/prism/serialize.c
148+
prism-srcs: $(srcdir)/prism/serialize.c
146149
$(srcdir)/prism/serialize.c: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/src/serialize.c.erb
147150
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) src/serialize.c $@
148151

149152
realclean-prism-srcs::
150153
$(RM) $(srcdir)/prism/serialize.c
151154

152-
main srcs: $(srcdir)/prism/tokens.c
155+
prism-srcs: $(srcdir)/prism/tokens.c
153156
$(srcdir)/prism/tokens.c: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/src/tokens.c.erb
154157
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) src/tokens.c $@
155158

‎prism/srcs.mk.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,17 @@ realclean-prism-srcs:: distclean-prism-srcs
3131
$(RM) $(PRISM_SRCDIR)/<%=%><%=srcs%>
3232

3333
realclean-srcs-local:: realclean-prism-srcs
34+
35+
main srcs: prism-srcs
36+
main incs: prism-incs
3437
<% Prism::Template::TEMPLATES.map do |t|
3538
/\.(?:[ch]|rb)\z/ =~ t or next
3639
s = '$(srcdir)/' + t.sub(%r[\A(?:(src)|ext|include)/]) {$1 && 'prism/'}
3740
s.sub!(%r[\A\$(srcdir)/prism/], '$(PRISM_SRCDIR)/')
3841
target = s.end_with?('.h') ? 'incs' : 'srcs'
3942
# %>
4043
41-
main <%=%><%=target%>: <%=%><%=s%>
44+
prism-<%=%><%=target%>: <%=%><%=s%>
4245
<%=%><%=s%>: $(PRISM_CONFIG) $(PRISM_TEMPLATE) $(PRISM_TEMPLATES_DIR)/<%=%><%=t%>.erb
4346
$(Q) $(BASERUBY) $(PRISM_TEMPLATE) <%=%><%=t%> $@
4447

‎tool/dump_ast.mkmf.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
mkpath(dirs)
2121
File.write('Makefile', [MakeMakefile.configuration(srcdir.to_s), <<~MAKEFILE].join(""))
2222
target = #{target}#{$EXEEXT}
23-
objs = #{File.basename(target, '.*')}.#{$OBJEXT} #{objs.join(' ')}
23+
objs = #{objs.join(' ')}
2424
2525
$(target): $(objs)
2626
\t#{link} $(objs)

0 commit comments

Comments
 (0)