NDT-DEV email list created

Revision: 1159
Author:   

Date:     Wed Nov 12 15:57:16 2014 UTC
Log:      Add a precompiled version of the flash client so the RPM can be  
built in something like mock, and add a few misc. packaging fixes so the  
RPM builds


https://code.google.com/p/ndt/source/detail?r=1159

Added:
 /branches/Issue162/flash-client/precompiled
 /branches/Issue162/flash-client/precompiled/FlashClt.swf
Modified:
 /branches/Issue162/HTML5-frontend/Makefile.am
 /branches/Issue162/Makefile.am
 /branches/Issue162/configure.ac
 /branches/Issue162/flash-client/Makefile.am
 /branches/Issue162/ndt.spec

=======================================
--- /dev/null   
+++ /branches/Issue162/flash-client/precompiled/FlashClt.swf	Wed Nov 12  
15:57:16 2014 UTC
Binary file, no diff available.
=======================================
--- /branches/Issue162/HTML5-frontend/Makefile.am	Fri Nov  7 08:49:50 2014  
UTC
+++ /branches/Issue162/HTML5-frontend/Makefile.am	Wed Nov 12 15:57:16 2014  
UTC
@@ -18,8 +18,9 @@

 ndtdir = $(prefix)/ndt

-nobase_ndt_DATA = jquery-1.4.4.min.js ie.css style.css gauge.min.js  
widget.html \
+ndt_DATA = jquery-1.4.4.min.js ie.css style.css gauge.min.js widget.html \
           images/mlab-logo.png images/mlab-logo-small.png script.js \
            fonts/digital-7-mono.ttf fonts/League_Gothic.otf \
            fonts/League_Gothic.eot embed.html set-active-client.sh

+EXTRA_DIST = $(ndt_DATA)
=======================================
--- /branches/Issue162/Makefile.am      Wed Nov 12 12:45:46 2014 UTC
+++ /branches/Issue162/Makefile.am      Wed Nov 12 15:57:16 2014 UTC
@@ -22,14 +22,20 @@
 SUBDIRS += Applet
 endif

+if INCLUDE_FLASH
+SUBDIRS += flash-client
+endif
+
 if HAVE_GCJ
 SUBDIRS += Admin janalyze
-if HAVE_MXMLC
-if BUILD_FLASH_CLT
-SUBDIRS += flash-client
 endif
-endif
-endif
+
+sbin_SCRIPTS = ndt-flashpolicyd
+
+
+ndtdir = $(prefix)/ndt
+ndt_DATA = admin_description.html admin.html flashpolicy.xml \
+          copyright.html web100variables.html web100_variables

 EXTRA_DIST = admin_description.html admin.html \
 	tcpbw100.template tcpbw100-java.template copyright.html  
web100variables.html \
@@ -38,23 +44,10 @@
        contrib/README contrib/loadmap.intro contrib/loadmap.js \
        contrib/loadmap.txt contrib/Tcpbw1001.java \
        tfw/client.py tfw/communication.py tfw/hosts.py tfw/network.py \
-       tfw/Readme tfw/scenarios.py tfw/server.py tfw/traffics.py 
tfw/widgets.py
-
-ndtdir = $(prefix)/ndt
-ndt_DATA = admin_description.html admin.html flashpolicy.xml \
-          copyright.html web100variables.html web100_variables
-
-sbin_SCRIPTS = ndt-flashpolicyd
+       tfw/Readme tfw/scenarios.py tfw/server.py tfw/traffics.py 
tfw/widgets.py \
+        $(sbin_SCRIPTS) $(ndt_DATA)

 sdatadir:
 	test -z "$(DESTDIR)$(ndtdir)/serverdata" ||  
$(mkdir_p) "$(DESTDIR)$(ndtdir)/serverdata"

 install: sdatadir install-recursive
-
-# uncomment this when we stop using broken automake 1.5
-# (then remove from DIST_EXTRA in subdir)
-#nobase_include_HEADERS = bwlib/bwlib.h
-
-#EXTRA_DIST    =               bootstrap
-#MAINTAINERCLEANFILES  =       aclocal.m4 Makefile.in configure config.log \
-#                              config.status
=======================================
--- /branches/Issue162/configure.ac     Wed Nov 12 12:59:22 2014 UTC
+++ /branches/Issue162/configure.ac     Wed Nov 12 15:57:16 2014 UTC
@@ -148,18 +148,41 @@


 # Enabling/disabling flash client build
-AC_ARG_ENABLE(flash, [  --enable-flash=[yes/no] turn on flash client build
-              [default=yes]],, enable_flash=yes)
+AC_ARG_WITH(flash, [  --enable-flash=[yes/no/precompiled/auto] turn on  
flash client build
+              [default=auto]],, enable_flash=yes)
+
+if test "x$with_flash" == "xauto"; then
+    AC_CHECK_PROGS(NDTMXMLC, mxmlc)
+    if test -n "$NDTMXMLC"; then
+        with_flash=yes
+    else
+        with_flash=precompiled
+    fi
+fi
+
+if test "x$with_flash" == "xyes"; then
+    AC_CHECK_PROGS(NDTMXMLC, mxmlc)
+    if test -z "$NDTMXMLC"; then
+      AC_MSG_FAILURE([mxmlc required to rebuild flash client but not  
available])
+    fi
+fi
+
+if test "x$with_flash" != "xno"; then
+       AM_CONDITIONAL(INCLUDE_FLASH, true)
+else
+       AM_CONDITIONAL(INCLUDE_FLASH, false)
+fi

-if test "x$enable_flash" != "xno"; then
-       AM_CONDITIONAL(BUILD_FLASH_CLT, true)
+if test "x$with_flash" != "xprecompiled"; then
+       AM_CONDITIONAL(BUILD_FLASH, true)
 else
-       AM_CONDITIONAL(BUILD_FLASH_CLT, false)
+       AM_CONDITIONAL(BUILD_FLASH, false)
 fi

+
 AC_ARG_WITH(I2util,
                AC_HELP_STRING([--with-I2util=<dir>],
-                               [defaults to building I2util under owamp if 
exists]),
+                               [defaults to building I2util under NDT if 
exists]),
                with_I2util=$withval, with_I2util=yes)

 #
@@ -458,14 +481,10 @@
 SUMMARY_JANALYZEJAR="NO    (missing java compiler)"
 fi

-if test -z "$HAVE_MXMLC_TRUE" && test -n "$HAVE_MXMLC_FALSE"; then
-if test "x$enable_flash" != "xno"; then
+if test "x$with_flash" != "xno"; then
 SUMMARY_FLASHCLT="YES"
 else
-SUMMARY_FLASHCLT="NO (disabled by user)"
-fi
-else
-SUMMARY_FLASHCLT="NO (missing action script compiler)"
+SUMMARY_FLASHCLT="NO"
 fi

 if test "$SUMMARY_WEB100CLT" = "YES" && test "$SUMMARY_FLASHCLT" = "YES"  
&& test "$SUMMARY_TCPBW100JAR" = "YES"; then
=======================================
--- /branches/Issue162/flash-client/Makefile.am Wed Feb  5 13:31:05 2014 UTC
+++ /branches/Issue162/flash-client/Makefile.am Wed Nov 12 15:57:16 2014 UTC
@@ -34,7 +34,11 @@
        mkdir -p dist

 FlashClt.swf: $(TEMPDIRS)
+if BUILD_FLASH
                $(NDTMXMLC) src/Main.as $(NDTMXMLCFLAGS);
+else
+               cp precompiled/FlashClt.swf dist
+endif

 mostlyclean-generic:
        rm -rf $(TEMPDIRS) *~
@@ -43,5 +47,6 @@
 		src/locale/ca_ES/DisplayMessages.properties  
src/locale/el_GR/DisplayMessages.properties \
 		src/locale/en_US/DisplayMessages.properties  
src/locale/fr_FR/DisplayMessages.properties \
 		src/locale/nb_NO/DisplayMessages.properties  
src/locale/nl_NL/DisplayMessages.properties \
-		src/locale/pt_BR/DisplayMessages.properties  
src/locale/ru_RU/DisplayMessages.properties
+		src/locale/pt_BR/DisplayMessages.properties  
src/locale/ru_RU/DisplayMessages.properties \
+               precompiled/FlashClt.swf

=======================================
--- /branches/Issue162/ndt.spec Wed Nov 12 13:35:52 2014 UTC
+++ /branches/Issue162/ndt.spec Wed Nov 12 15:57:16 2014 UTC
@@ -60,9 +60,9 @@

 %build
 %if "%{?CERT_FILE}" == ""
-%configure --with-I2util=%{_libdir} --enable-fakewww  
--with-java=precompiled
+%configure --with-I2util=%{_libdir} --enable-fakewww  
--with-java=precompiled --with-flash=precompiled
 %else
-%configure --with-I2util=%{_libdir} --enable-fakewww   
--with-java=precompiled --with-cert="%{CERT_FILE}"  
--with-alias="%{CERT_ALIAS}"
+%configure --with-I2util=%{_libdir} --enable-fakewww   
--with-java=precompiled --with-cert="%{CERT_FILE}"  
--with-alias="%{CERT_ALIAS}" --with-flash=precompiled
 %endif

 #make %{?_smp_mflags}
@@ -110,13 +110,13 @@
 %files server
 %defattr(-,root,root,-)
 %{_sbindir}/*
-%config(noreplace) %{_initrddir}/%{name}
+%{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %{_prefix}/%{name}
 %dir %{_localstatedir}/lib/%{name}
 %dir %{_localstatedir}/log/%{name}
-%{_prefix}/%{name}/[^d]*
+%{_prefix}/%{name}/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 %{_mandir}/man1/analyze.1.gz
@@ -125,7 +125,6 @@
 %{_mandir}/man1/viewtrace.1.gz
 %{_bindir}/analyze
 %{_bindir}/genplot
-%{_bindir}/genplot10g
 %{_bindir}/tr-mkmap
 %{_bindir}/viewtrace

@@ -139,6 +138,9 @@
 %{_bindir}/ndtclt

 %changelog
+* Wed Nov 12 2014 Aaron Brown 
<>
 - 3.7.0-1
+- Initial NDT 3.7.0 release candidate RPM
+
 * Tue Sep 25 2012 Kavitha Kumar 
<>
 - 3.6.5.2
 - Change NDT version to 3.6.5.2_rc2