Changeset 1194 for TI05-delivery/trunk

Timestamp:

15/06/06 12:44:36 (13 years ago)

Author:

spascoe

Message:

Everything can now be built from setup.py.

Location:

TI05-delivery/trunk

Files:

• Doxyfile (modified) (1 diff)
• setup.py (modified) (3 diffs)
• src/Makefile (modified) (2 diffs)

TI05-delivery/trunk/Doxyfile

@@ -631 +631 @@
 # generate Latex output.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 

TI05-delivery/trunk/setup.py

@@ -2 +2 @@
 """
 
-from distutils.core import setup, Extension
+from distutils.core import setup, Extension, Command
+import sys, os
 
 bbftpd_home = './src/bbftp-server-3.2.0'
@@ -78 +79 @@
                                                                             './src/python_ext/util.c']
 
+#-------------------------------------------------------------------------------------------
+
+class Doc(Command):
+    """Build epydoc and doxygen documentation.
+    """
+
+    user_options = []
+
+    def initialize_options(self):
+        pass
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        cmd = 'epydoc -o doc/epydoc -v --docformat javadoc build/lib*/delivery/'
+        self.execute(os.system, (cmd,))
+        self.execute(os.system, ('doxygen',))
+
+from distutils.command.build import build
+
+class MyBuild(build):
+    def run(self):
+        self.execute(os.system, ('make -C src',))
+        build.run(self)
+
+#-------------------------------------------------------------------------------------------
+
+
+
+
+
+
+
+
 bbftpd = Extension('delivery.bbftpd',
                    define_macros = [('NDG_AUTH', 1), ('LOCAL_SYSLOG_FACILITY', 1),
@@ -105 +140 @@
       ext_modules = [
                      bbftpd,
-                     bbftpc])
+                     bbftpc],
+      cmdclass = {'doc': Doc, 'build': MyBuild}
+      )
       

TI05-delivery/trunk/src/Makefile

@@ -16 +16 @@
 all: server client
 
-server:
-        make -C $(BBFTPD)
+server: $(BBFTPD)/bbftpd
 
-client:
-        make -C $(BBFTPC)
+client: $(BBFTPC)/bbftpc
 
-# Configure and build bbftp
-config:
-        ( cd $(BBFTPC) ; ./configure $(CONFIG_OPTS) ) 
-        ( cd $(BBFTPD) ; ./configure $(CONFIG_OPTS) )
+
 
 install:
@@ -38 +33 @@
 clean_client:
         -rm $(BBFTPC)/*.o $(BBFTPC)/bbftp
+
+
+
+
+$(BBFTPC)/Makefile: $(BBFTPC)/configure
+        ( cd $(BBFTPC) ; ./configure $(CONFIG_OPTS) )
+
+$(BBFTPD)/Makefile: $(BBFTPD)/configure
+        ( cd $(BBFTPD) ; ./configure $(CONFIG_OPTS) )
+
+$(BBFTPD)/bbftpd: $(BBFTPD)/Makefile
+        make -C $(BBFTPD)
+
+$(BBFTPC)/bbftpc: $(BBFTPC)/Makefile
+        make -C $(BBFTPC)