Any suggestions on how to get the SWIG targets from build-outputs.mk
(defined in build.conf) to depend upon the "mkdir-init" object-less
target from Makefile.in?
dlr@tigris.org wrote:
> Author: dlr
> Date: Tue Sep 23 01:25:42 2003
> New Revision: 7153
>
> Modified:
> trunk/Makefile.in
> trunk/build.conf
> trunk/build/generator/gen_base.py
> trunk/build/generator/gen_make.py
> Log:
> Rolled back to r7151, build changes from r7152 not ready for prime time.
>
> Modified: trunk/Makefile.in
> ==============================================================================
> --- trunk/Makefile.in (original)
> +++ trunk/Makefile.in Tue Sep 23 01:25:42 2003
> @@ -34,6 +34,15 @@
> SWIG_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig
> SWIG_BUILD_DIR = $(abs_builddir)/subversion/bindings/swig
>
> +### these should go away; gen-make should place this into BUILD_DIRS
> +SWIG_DIRS = subversion/bindings/swig/python \
> + subversion/bindings/swig/java \
> + subversion/bindings/swig/java/org \
> + subversion/bindings/swig/java/org/tigris \
> + subversion/bindings/swig/java/org/tigris/subversion \
> + subversion/bindings/swig/java/org/tigris/subversion/swig \
> + subversion/bindings/swig/perl
> +
> EXTERNAL_PROJECT_DIRS = @SVN_SUBDIRS@
>
> NEON_LIBS = @NEON_LIBS@
> @@ -277,7 +286,7 @@
> tests.log
>
> mkdir-init:
> - @list='$(BUILD_DIRS) $(DOC_DIRS)'; \
> + @list='$(BUILD_DIRS) $(DOC_DIRS) $(SWIG_DIRS)'; \
> for i in $$list doc; do \
> echo "mkdir $$i" ; \
> $(MKDIR) $$i ; \
>
> Modified: trunk/build.conf
> ==============================================================================
> --- trunk/build.conf (original)
> +++ trunk/build.conf Tue Sep 23 01:25:42 2003
> @@ -59,16 +59,6 @@
> subversion/tests/clients/cmdline/svnlook_tests.py
> subversion/tests/clients/cmdline/svnversion_tests.py
>
> -[swig-dirs]
> -paths =
> - subversion/bindings/swig/python
> - subversion/bindings/swig/java
> - subversion/bindings/swig/java/org
> - subversion/bindings/swig/java/org/tigris
> - subversion/bindings/swig/java/org/tigris/subversion
> - subversion/bindings/swig/java/org/tigris/subversion/swig
> - subversion/bindings/swig/perl
> -
> # ----------------------------------------------------------------------------
> #
> # BUILD TARGETS
> @@ -237,6 +227,7 @@
> sources = svn_client.i
> libs = libsvn_client
> description = Subversion client library bindings
> +deps = mkdir-init
>
> [swig_delta]
> type = swig
>
> Modified: trunk/build/generator/gen_base.py
> ==============================================================================
> --- trunk/build/generator/gen_base.py (original)
> +++ trunk/build/generator/gen_base.py Tue Sep 23 01:25:42 2003
> @@ -131,10 +131,10 @@
> script_dirs = map(os.path.dirname, self.scripts + self.fs_scripts)
>
> # remove duplicate directories between targets and tests
> - build_dirs = self.target_dirs.copy().keys()
> - build_dirs.extend(script_dirs)
> - build_dirs.extend(_collect_paths(parser.get('swig-dirs', 'paths')))
> - self.build_dirs = build_dirs
> + build_dirs = self.target_dirs.copy()
> + for d in script_dirs:
> + build_dirs[d] = None
> + self.build_dirs = build_dirs.keys()
>
> def find_sections(self, section_list):
> """Return a list of section objects from a string of section names."""
> @@ -596,7 +596,6 @@
> 'static-apache',
> 'test-scripts',
> 'fs-test-scripts',
> - 'swig-dirs',
> ]
>
> def _filter_sections(t):
>
> Modified: trunk/build/generator/gen_make.py
> ==============================================================================
> --- trunk/build/generator/gen_make.py (original)
> +++ trunk/build/generator/gen_make.py Tue Sep 23 01:25:42 2003
> @@ -204,12 +204,9 @@
>
> for objname, sources in self.graph.get_deps(gen_base.DT_SWIG_C):
> deps = string.join(map(str, sources))
> - source = os.path.join('$(top_srcdir)', str(sources[0]))
> - if objname.lang_abbrev == 'java':
> - source = os.path.split(source)[1]
> self.ofile.write('%s: %s\n\t$(RUN_SWIG_%s) %s\n'
> % (objname, deps, string.upper(objname.lang_abbrev),
> - source))
> + os.path.join('$(top_srcdir)', str(sources[0]))))
>
> for objname, sources in self.graph.get_deps(gen_base.DT_OBJECT):
> deps = string.join(map(str, sources))
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 23 19:43:18 2003