From gitlab at videolan.org  Fri Dec  7 13:04:18 2018
From: gitlab at videolan.org (Jean-Paul Saman)
Date: Fri, 07 Dec 2018 13:04:18 +0100
Subject: [libdvbpsi-devel] [Git][videolan/libdvbpsi][master] Added a
 configure switch to enable/disable examples build
Message-ID: <5c0a61c215d3_c0a3fbe5428a8a036576e@gitlab.mail>

Jean-Paul Saman pushed to branch master at VideoLAN / libdvbpsi


Commits:
5700ed2f by Konstantin Pavlov at 2018-11-30T17:29:05Z
Added a configure switch to enable/disable examples build

- - - - -


2 changed files:

- Makefile.am
- configure.ac


Changes:

=====================================
Makefile.am
=====================================
@@ -2,7 +2,12 @@
 
 ACLOCAL_AMFLAGS=-I m4
 
-SUBDIRS = src examples misc
+SUBDIRS = src
+
+if BUILD_EXAMPLES
+SUBDIRS += examples misc
+endif
+
 DIST_SUBDIRS = $(SUBDIRS) doc
 
 EXTRA_DIST = libdvbpsi.spec libdvbpsi.spec.in libdvbpsi.pc.in bootstrap
@@ -15,9 +20,6 @@ doc-dummy:
 doc: doc-dummy
 	$(MAKE) -C doc doc
 
-test_dr.c:
-	$(MAKE) -C misc test_dr.c
-
 changelog:
 	cvs2cl --utc --hide-filenames --no-wrap -w --stdout -g -z9 | \
 	  sed -e 's/^[^0-9]/ /' -e 's/^  *$$//' -e 's/^ \* 	/ /g' | \
@@ -30,5 +32,10 @@ dist-checksum: $(DIST_ARCHIVES)
 	  sha256sum $$sum > $$sum.sha256; \
 	done
 
+if BUILD_EXAMPLES
+test_dr.c:
+	$(MAKE) -C misc test_dr.c
+
 generate-header_dr:
 	misc/gen_dr_h.sh > src/descriptors/dr.h
+endif


=====================================
configure.ac
=====================================
@@ -145,6 +145,16 @@ if test "${ac_cv_asprintf}" != "no"; then
     AC_DEFINE(HAVE_ASPRINTF, 1, [Support for asprintf() and vasprintf()])
 fi
 
+# dnl Whether or not build examples
+AC_ARG_ENABLE([examples],
+  [AS_HELP_STRING([--enable-examples],
+  [build examples (default is yes)])],
+  [build_examples=$enableval],
+  [build_examples=yes])
+
+dnl use examples
+AM_CONDITIONAL([BUILD_EXAMPLES], [ test $build_examples = "yes" ])
+
 dnl
 dnl Generate Makefiles and other output files
 dnl
@@ -166,4 +176,5 @@ release               : ${release}
 compatibility old api : ${compat}
 compile flags         : ${CFLAGS}
 build for             : ${SYS}
+build examples        : ${build_examples}
 "



View it on GitLab: https://code.videolan.org/videolan/libdvbpsi/commit/5700ed2f2311b3477706bac2fd030b2855720e68

-- 
View it on GitLab: https://code.videolan.org/videolan/libdvbpsi/commit/5700ed2f2311b3477706bac2fd030b2855720e68
You're receiving this email because of your account on code.videolan.org.

From gitlab at videolan.org  Fri Dec  7 13:12:41 2018
From: gitlab at videolan.org (Jean-Paul Saman)
Date: Fri, 07 Dec 2018 13:12:41 +0100
Subject: [libdvbpsi-devel] [Git][videolan/libdvbpsi][master] 2 commits: CI:
 added debian, macos, win32 and win64 build jobs.
Message-ID: <5c0a63b956700_c0a3fbe5428af58366113@gitlab.mail>

Jean-Paul Saman pushed to branch master at VideoLAN / libdvbpsi


Commits:
8d4c8b38 by Konstantin Pavlov at 2018-12-07T12:08:21Z
CI: added debian, macos, win32 and win64 build jobs.

- - - - -
be3ae322 by Konstantin Pavlov at 2018-12-07T12:08:21Z
CI: Disable examples for cross builds.

- - - - -


1 changed file:

- + .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -0,0 +1,57 @@
+stages:
+    - build
+
+variables:
+    GIT_SUBMODULE_STRATEGY: normal
+
+build-debian:
+    image: registry.videolan.org:5000/vlc-debian-unstable:20181128113529
+    stage: build
+    tags:
+        - debian
+        - amd64
+    script:
+        - autoreconf -fisv
+        - mkdir build
+        - cd build
+        - ../configure
+        - make -j $(getconf _NPROCESSORS_ONLN)
+
+build-macos:
+    stage: build
+    tags:
+        - macos
+    script:
+        - autoreconf -fisv
+        - mkdir build
+        - cd build
+        - ../configure
+        - make -j $(getconf _NPROCESSORS_ONLN)
+
+build-win64:
+    image: registry.videolan.org:5000/vlc-debian-win64:20181107154313
+    stage: build
+    tags:
+        - debian
+        - amd64
+        - win64
+    script:
+        - autoreconf -fisv
+        - mkdir build
+        - cd build
+        - ../configure --host=x86_64-w64-mingw32 --disable-examples
+        - make -j $(getconf _NPROCESSORS_ONLN)
+
+build-win32:
+    image: registry.videolan.org:5000/vlc-debian-win32:20181107151708
+    stage: build
+    tags:
+        - debian
+        - amd64
+        - win32
+    script:
+        - autoreconf -fisv
+        - mkdir build
+        - cd build
+        - ../configure --host=i686-w64-mingw32 --disable-examples
+        - make -j $(getconf _NPROCESSORS_ONLN)



View it on GitLab: https://code.videolan.org/videolan/libdvbpsi/compare/5700ed2f2311b3477706bac2fd030b2855720e68...be3ae3225f5270d259d4e434898946cb95ca3217

-- 
View it on GitLab: https://code.videolan.org/videolan/libdvbpsi/compare/5700ed2f2311b3477706bac2fd030b2855720e68...be3ae3225f5270d259d4e434898946cb95ca3217
You're receiving this email because of your account on code.videolan.org.