Checkout
rhuijben
committed
on 12 Jul 13
In the Windows project generator: move the code that locates external libraries
to a separate python file.

* win-tests.py
Import just gen… Show more
In the Windows project generator: move the code that locates external libraries

to a separate python file.

* win-tests.py

 Import just gen_win_dependencies.py

 

* build/generator/gen_win.py

 Import gen_win_dependencies.py

 

 (SVNCommonLibrary): Move to gen_win_dependencies.py.

 (GeneratorBase): Move to gen_win_dependencies.py

 

 (WinGeneratorBase): Inherit GenDependenciesBase fom gen_win_dependencies.py

 (WinGeneratorBase.__init__): Call ancestor initializer. Request no library  

   finding from the constructor. Explicitly locate libraries later.

   Move library locator code to find_libraries)

 (WinGeneratorBase.find_libraries): New function.

 

 (_find_perl,

  _find_ruby,

  _find_python,

  _find_jdk,

  _find_swig,

  _find_swig_libdir,

  _find_ml,

  _get_serf_version,

  _find_serf,

  _find_apr,

  _find_apr_util,

  _find_sqlite,

  _find_zlib,

  escape_shell_arg): Move to gen_win_dependencies.py.

* build/generator/gen_win_dependencies.py

 New file. Copied from gen_win.py.

 

 (GeneratorBase): Renamed to ...

 (GenDependenciesBase): ... this.

 (GenDependenciesBase.__init__): Add optional argument.

   Delegate finding libraries to helper function.

   

 (_find_bdb): Produce warning when not found, but allowed

 (_find_perl,

  _find_ruby,

  _find_python,

  _find_jdk,

  _find_swig,

  _find_swig_libdir,

  _find_ml,

  _get_serf_version,

  _find_serf,

  _find_apr,

  _find_apr_util,

  _find_sqlite,

  _find_zlib,

  escape_shell_arg): Functions moved here from gen_win.py

Show less