[asterisk-commits] dlee: trunk r401263 - in /trunk: ./ contrib/scripts/ static-http/

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Oct 18 16:51:01 2013
New Revision: 401263

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401263
Log:
This is just a quick script for dumping swagger-ui into static-http,
so that it can be served by the Asterisk web server.

I had to change the Makefile in order to recursively install content
from the static-http directory, hence the code review instead of just
putting it in.

Review: https://reviewboard.asterisk.org/r/2924/
........

Merged revisions 401261 from http://svn.asterisk.org/svn/asterisk/branches/12

Added:
    trunk/contrib/scripts/get_swagger_ui.sh
      - copied unchanged from r401261, branches/12/contrib/scripts/get_swagger_ui.sh
Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/static-http/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=401263&r1=401262&r2=401263
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Oct 18 16:51:01 2013
@@ -437,12 +437,15 @@
 
 datafiles: _all doc/core-en_US.xml
 	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
-# Should static HTTP be installed during make samples or even with its own target ala
-# webvoicemail?  There are portions here that *could* be customized but might also be
-# improved a lot.  I'll put it here for now.
-
-	for x in static-http/*; do \
-		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
+
+#	# Recursively install contents of the static-http directory, in case
+#	# extra content is provided there. See contrib/scripts/get_swagger_ui.sh
+	find static-http | while read x; do \
+		if test -d $$x; then \
+			$(INSTALL) -m 755 -d "$(DESTDIR)$(ASTDATADIR)/$$x"; \
+		else \
+			$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/$$x" ; \
+		fi \
 	done
 	$(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
 	$(INSTALL) -m 644 doc/snapshots.xslt "$(DESTDIR)$(ASTDATADIR)/static-http";

Propchange: trunk/static-http/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 18 16:51:01 2013
@@ -1,0 +1,1 @@
+swagger-ui