Merge pull request #9 from srl295/cdemo-upd

ICU-13668 update all icu4c demos to work
unicode-org · Oct 7, 2019 · af113a9 · af113a9
2 parents fe212bc + 5a73430
commit af113a9
Show file tree

Hide file tree

Showing 40 changed files with 2,284 additions and 520 deletions.
diff --git a/apputil/Makefile.in b/apputil/Makefile.in
@@ -17,7 +17,6 @@ CONFIG_H=demo_config.h
 LIBPREFIX=lib
 # srcdir must be set before this is included
 include $(top_builddir)/icuapps.mk
-include $(shell $(ICU_CONFIG) --incfile) 
 
 ## Extra files to remove for 'make clean'
 CLEANFILES = *~ $(DEPS)

diff --git a/convexp/Makefile.in b/convexp/Makefile.in
@@ -43,7 +43,7 @@ install-local: all-local install-target
 install-target: all-local
 	$(MKINSTALLDIRS) $(BINDIR) $(DESTDIR)$(BINDIR)/data
 	$(INSTALL) $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET)
-	$(INSTALL) convexp-header.html $(DESTDIR)$(BINDIR)/data
+	$(INSTALL) $(srcdir)/convexp-header.html $(DESTDIR)$(BINDIR)/data
 
 dist-local:
 

diff --git a/dumpdat/Makefile.in b/dumpdat/Makefile.in
@@ -53,8 +53,8 @@ distclean distclean-local target-clean-local dist dist-local check	\
 check-local
 
 install-local: all-local
-	$(MKINSTALLDIRS) $(BINDIR)
-	$(INSTALL) $(TARGET) $(BINDIR)/$(TARGET)
+	$(MKINSTALLDIRS) $(DESTDIR)$(BINDIR)
+	$(INSTALL) $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET)
 
 all-local: $(TARGET)
 

diff --git a/icu-kube/docker.d/icu4c-demos/Dockerfile b/icu-kube/docker.d/icu4c-demos/Dockerfile
@@ -31,10 +31,13 @@ RUN mkdir /home/build/build /home/build/src
 WORKDIR /home/build/build
 ADD . /home/build/src/
 ENV PREFIX=/home/build/icu
-RUN ~/src/configure  --prefix=${PREFIX} ICU_CONFIG=$(which icu-config) 
-RUN make all OBS= && make install OBS= DESTDIR=${PREFIX}
+# HACK: translitdemo is not out of source enabled
+RUN cp -R /home/build/src/translitdemo /home/build/build/translitdemo
+RUN ~/src/configure  --prefix=${PREFIX} ICU_CONFIG=$(which icu-config) && \
+ make all install OBS= DESTDIR=${PREFIX} CONTEXTPATH=/icu-bin/ ICU_COMMON_HEADERS=/home/build/src/icu-kube/icuheaders
 #make -k DEPS= clean && make -k DEPS= distclean && sudo apt-get purge -y git subversion python3 doxygen zip curl g++ && sudo apt-get -y autoremove && sudo apt-get clean -y
 #RUN make all
+RUN cp -R /home/build/src/translitdemo /home/build/icu/translitdemo
 
 FROM alpine:latest as httpd
 USER root
@@ -47,6 +50,8 @@ COPY --from=build /home/build/icu /home/build/icu
 RUN if [ -d /home/build/icu/usr/local ]; then (cd /home/build/icu/usr/; ln -sv local/* .); fi; ls -l /home/build/icu/usr/bin/
 ENV LD_LIBRARY_PATH /home/build/icu/usr/lib
 EXPOSE 8080
+# this needs special treatment
+RUN cp -v /home/build/icu/usr/bin/data/collation.html /var/www/localhost/htdocs/ || true
 COPY icu-kube/lighttpd.conf /etc/lighttpd/lighttpd.conf
 COPY icu-kube/index.html /var/www/localhost/htdocs/index.html
 CMD ["lighttpd", "-D", "-f", "/etc/lighttpd/lighttpd.conf"]
diff --git a/icu-kube/icuheaders/README.md b/icu-kube/icuheaders/README.md
@@ -0,0 +1,4 @@
+# icuheaders
+
+This contains copies of ICU header files that are used by some demos.
+TODO: change demos to not depend on these.