Branch: refs/heads/master
Home: https://github.com/mono/gtk-sharp
Compare: https://github.com/mono/gtk-sharp/compare/ac9da8d4aa14...634f9e5f2741
Commit: 2d83fb3073c0780c57c9797df440e1a288a9539c
Author: Bertrand Lorentz <[email protected]> (bl8)
Date: 2013-10-13 15:04:56 GMT
URL: https://github.com/mono/gtk-sharp/commit/2d83fb3073c0780c57c9797df440e1a288a9539c
Move the fixup tool from the parser to the generator folder
The parser will be going away at some point in the future, but we
will still need the fixup step. And the fixup step is really more
of a preliminary step for the generator anyway.
Changed paths:
M Makefile.include
M configure.ac
M generator/Makefile.am
M parser/Makefile.am
M sample/opaquetest/Makefile.am
Added paths:
A generator/gapi-fixup.cs
A generator/gapi3-fixup.in
Removed paths:
D parser/gapi-fixup.cs
D parser/gapi3-fixup.in
Modified: Makefile.include
===================================================================
@@ -23,12 +23,12 @@ EXTRA_DIST = $(RAW_API) $(SYMBOLS) $(ASSEMBLY).config.in $(METADATA) $(sources)
build_symbols = $(addprefix --symbols=$(srcdir)/, $(SYMBOLS))
-$(API): $(METADATA) $(RAW_API) $(SYMBOLS) $(top_builddir)/parser/gapi-fixup.exe
+$(API): $(METADATA) $(RAW_API) $(SYMBOLS) $(top_builddir)/generator/gapi-fixup.exe
cp $(srcdir)/$(RAW_API) $(API)
chmod u+w $(API)
@if test -n '$(METADATA)'; then \
- echo "$(RUNTIME) $(top_builddir)/parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols)"; \
- $(RUNTIME) $(top_builddir)/parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols); \
+ echo "$(RUNTIME) $(top_builddir)/generator/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols)"; \
+ $(RUNTIME) $(top_builddir)/generator/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols); \
fi
api_includes = $(addprefix -I:, $(INCLUDE_API))
Modified: configure.ac
===================================================================
@@ -217,10 +217,10 @@ policy.config
sources/Makefile
parser/Makefile
parser/gapi-3.0.pc
-parser/gapi3-fixup
parser/gapi3-parser
generator/Makefile
generator/gapi3-codegen
+generator/gapi3-fixup
glib/Makefile
glib/glib-sharp-3.0.pc
glib/glib-sharp.dll.config
Modified: generator/Makefile.am
===================================================================
@@ -1,11 +1,14 @@
assemblydir = $(prefix)/lib/gapi-3.0
-assembly_DATA = gapi_codegen.exe
-bin_SCRIPTS = gapi3-codegen
-CLEANFILES = gapi_codegen.exe
-DISTCLEANFILES = gapi3-codegen
+assembly_DATA = gapi-fixup.exe gapi_codegen.exe
+bin_SCRIPTS = gapi3-fixup gapi3-codegen
+CLEANFILES = gapi-fixup.exe gapi_codegen.exe
+DISTCLEANFILES = gapi3-fixup gapi3-codegen
references =
+fixup_sources = \
+ gapi-fixup.cs
+
sources = \
AliasGen.cs \
ArrayParameter.cs \
@@ -71,10 +74,14 @@ sources = \
XmlElementExtensions.cs
build_sources = $(addprefix $(srcdir)/, $(sources))
-dist_sources = $(sources)
+build_fixup_sources = $(addprefix $(srcdir)/, $(fixup_sources))
EXTRA_DIST = \
- $(dist_sources)
+ $(sources) \
+ $(fixup_sources)
+
+gapi-fixup.exe: $(build_fixup_sources)
+ $(CSC) $(CSFLAGS) -out:gapi-fixup.exe $(srcdir)/gapi-fixup.cs
gapi_codegen.exe: $(build_sources)
$(CSC) $(CSFLAGS) -out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)
Renamed: generator/gapi-fixup.cs
===================================================================
Renamed: generator/gapi3-fixup.in
===================================================================
Modified: parser/Makefile.am
===================================================================
@@ -1,14 +1,13 @@
assemblydir = $(prefix)/lib/gapi-3.0
pkgconfigdir = $(libdir)/pkgconfig
-assembly_DATA = gapi-fixup.exe gapi-parser.exe
+assembly_DATA = gapi-parser.exe
pkgconfig_DATA = gapi-3.0.pc
-bin_SCRIPTS = gapi3-fixup gapi3-parser
+bin_SCRIPTS = gapi3-parser
assembly_SCRIPTS = gapi_pp.pl gapi2xml.pl
-CLEANFILES = gapi-fixup.exe gapi-parser.exe
-DISTCLEANFILES = gapi3-fixup gapi3-parser gapi-3.0.pc
+CLEANFILES = gapi-parser.exe
+DISTCLEANFILES = gapi3-parser gapi-3.0.pc
sources = \
- gapi-fixup.cs \
gapi-parser.cs
EXTRA_DIST = \
@@ -18,9 +17,6 @@ EXTRA_DIST = \
gapi2xml.pl \
gapi-3.0.pc.in
-gapi-fixup.exe: $(srcdir)/gapi-fixup.cs
- $(CSC) $(CSFLAGS) -out:gapi-fixup.exe $(srcdir)/gapi-fixup.cs
-
gapi-parser.exe: $(srcdir)/gapi-parser.cs
$(CSC) $(CSFLAGS) -out:gapi-parser.exe $(srcdir)/gapi-parser.cs
Modified: sample/opaquetest/Makefile.am
===================================================================
@@ -25,7 +25,7 @@ generated/*.cs: opaque-api.xml
api:
PATH=../../parser:$(PATH) $(RUNTIME) ../../parser/gapi-parser.exe opaque-sources.xml
- $(RUNTIME) ../../parser/gapi-fixup.exe --metadata=Opaque.metadata --api=opaque-api.xml
+ $(RUNTIME) ../../generator/gapi-fixup.exe --metadata=Opaque.metadata --api=opaque-api.xml
install:
Commit: 634f9e5f2741853a8f8206d7d66f3c8668ff61ca
Author: Andrés G. Aragoneses <[email protected]> (knocte)
Committer: Bertrand Lorentz <[email protected]> (bl8)
Date: 2013-10-13 15:05:41 GMT
URL: https://github.com/mono/gtk-sharp/commit/634f9e5f2741853a8f8206d7d66f3c8668ff61ca
generator: add a link to the README from the project
This way people who work on the generator using an IDE will see the file
Changed paths:
M generator/generator.csproj
Modified: generator/generator.csproj
===================================================================
@@ -97,6 +97,9 @@
</ItemGroup>
<ItemGroup>
<None Include="DESIGN" />
+ <None Include="..\README.generator">
+ <Link>README.generator</Link>
+ </None>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.