Index: uspace/lib/pcut/README.rst =================================================================== --- uspace/lib/pcut/README.rst (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ uspace/lib/pcut/README.rst (revision 15d0046f9b3c481dc13462cd9c94e9f757fa743d) @@ -65,5 +65,11 @@ ----------------------- -On Unix systems, running ``make`` and ``make install`` shall do the job. +PCUT uses CMake (http://www.cmake.org/). +On Unix systems, following commands build the library and execute the +built-in tests:: + + mkdir build + cd build + cmake .. && make all test More details can be found on https://github.com/vhotspur/pcut/wiki/Building. Index: uspace/lib/pcut/base.mak =================================================================== --- uspace/lib/pcut/base.mak (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ (revision ) @@ -1,46 +1,0 @@ -# -# Copyright (c) 2013 Vojtech Horky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - - -PCUT_INCLUDE = include -PCUT_CFLAGS = -Wall -Wextra -std=c99 -Werror -I$(PCUT_INCLUDE) - -PCUT_PREPROC_SOURCES = \ - src/preproc.c - -PCUT_SOURCES = \ - src/assert.c \ - src/list.c \ - src/main.c \ - src/print.c \ - src/report/report.c \ - src/report/tap.c \ - src/report/xml.c \ - src/run.c \ - $(PCUT_TARGET_SOURCES) - Index: uspace/lib/pcut/contrib/devcpp.mak =================================================================== --- uspace/lib/pcut/contrib/devcpp.mak (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ (revision ) @@ -1,41 +1,0 @@ -# -# Copyright (c) 2013 Vojtech Horky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# -# Makefile to be used by Orwell (formerly Bloodshed) Dev C++ editor -# - -TEST_CFLAGS = $(CFLAGS) -TEST_LDFLAGS = -L. -lpcut $(CFLAGS) -EXE_EXT = exe -TEST_BASE = tests/ - -PCUT_LIB = pcut.lib - -all-after: check-build -clean-custom: pcut-clean Index: uspace/lib/pcut/contrib/pcut.dev =================================================================== --- uspace/lib/pcut/contrib/pcut.dev (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ (revision ) @@ -1,189 +1,0 @@ -[Project] -FileName=pcut.dev -Name=PCUT -Type=2 -Ver=2 -ObjFiles= -Includes=include -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes=windows.mak;contrib/devcpp.mak -Compiler=-std=c99_@@_ -IsCpp=0 -OverrideOutputName=pcut.lib -OverrideOutput=1 -UseCustomMakefile=0 -Folders=Sources -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=3 -CompilerSettings=0000000100000000000000000 -UnitCount=17 - -[Unit1] -FileName=src\assert.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit2] -FileName=src\helper.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit3] -FileName=src\internal.h -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit4] -FileName=src\list.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit5] -FileName=src\main.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit6] -FileName=src\print.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit7] -FileName=src\run.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit8] -FileName=src\report\report.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit9] -FileName=src\report\report.h -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit10] -FileName=src\report\tap.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit11] -FileName=src\report\xml.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit12] -FileName=src\os\generic.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit13] -FileName=src\os\stdc.c -CompileCpp=0 -Folder=Sources -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit14] -FileName=README.rst -Folder=PCUT -Compile=0 -Link=0 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit15] -FileName=windows.mak -Folder=PCUT -Compile=0 -Link=0 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit16] -FileName=contrib\devcpp.mak -Folder=PCUT -Compile=0 -Link=0 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit17] -FileName=pcut.mak -Folder=PCUT -Compile=0 -Link=0 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - Index: uspace/lib/pcut/helenos.mak =================================================================== --- uspace/lib/pcut/helenos.mak (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ uspace/lib/pcut/helenos.mak (revision 15d0046f9b3c481dc13462cd9c94e9f757fa743d) @@ -27,9 +27,14 @@ # -PCUT_TARGET_SOURCES = src/os/helenos.c - --include base.mak - -SOURCES = $(PCUT_SOURCES) +SOURCES = \ + src/os/helenos.c \ + src/assert.c \ + src/list.c \ + src/main.c \ + src/print.c \ + src/report/report.c \ + src/report/tap.c \ + src/report/xml.c \ + src/run.c EXTRA_CFLAGS = -D__helenos__ -Iinclude LIBRARY = libpcut Index: uspace/lib/pcut/pcut.mak =================================================================== --- uspace/lib/pcut/pcut.mak (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ (revision ) @@ -1,43 +1,0 @@ -# -# Copyright (c) 2013 Vojtech Horky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - --include base.mak - -all: $(PCUT_LIB) $(PCUT_PREPROC) - -pcut-clean: check-clean platform-clean - $(RM) *.$(OBJ_EXT) src/*.$(OBJ_EXT) src/*/*.$(OBJ_EXT) - -%.o: %.c - -src/%.o: src/%.c - $(CC) -c -o $@ $(PCUT_CFLAGS) $< - -doxygen: - doxygen doc/Doxyfile.devel - doxygen doc/Doxyfile.user Index: uspace/lib/pcut/tests/helenos.mak =================================================================== --- uspace/lib/pcut/tests/helenos.mak (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ (revision ) @@ -1,39 +1,0 @@ -# -# Copyright (c) 2014 Vojtech Horky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - - -# -# Add the check-build target for compiling all the tests -# -PCUT_LIB = libpcut.a -TEST_BASE = tests/ -EXE_EXT = run -TEST_CFLAGS = $(CFLAGS) -TEST_LDFLAGS = -n $(LFLAGS) -T $(LINKER_SCRIPT) $(PCUT_LIB) $(LIBS) $(BASE_LIBS) --include tests/tests.mak -clean: check-clean Index: uspace/lib/pcut/tests/tests.mak =================================================================== --- uspace/lib/pcut/tests/tests.mak (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ (revision ) @@ -1,80 +1,0 @@ -# -# Copyright (c) 2013 Vojtech Horky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -TEST_DEPS = $(TEST_BASE)tested.o - -TEST_APPS = \ - $(TEST_BASE)alloc.$(EXE_EXT) \ - $(TEST_BASE)asserts.$(EXE_EXT) \ - $(TEST_BASE)errno.$(EXE_EXT) \ - $(TEST_BASE)manytests.$(EXE_EXT) \ - $(TEST_BASE)multisuite.$(EXE_EXT) \ - $(TEST_BASE)null.$(EXE_EXT) \ - $(TEST_BASE)nullteardown.$(EXE_EXT) \ - $(TEST_BASE)printing.$(EXE_EXT) \ - $(TEST_BASE)simple.$(EXE_EXT) \ - $(TEST_BASE)skip.$(EXE_EXT) \ - $(TEST_BASE)suites.$(EXE_EXT) \ - $(TEST_BASE)teardown.$(EXE_EXT) \ - $(TEST_BASE)timeout.$(EXE_EXT) - -check-build: $(TEST_APPS) - -.PRECIOUS: $(TEST_BASE)tested.o - -check-clean: - rm -f $(TEST_BASE)*.o $(TEST_BASE)*.pcut.c $(TEST_BASE)*.$(EXE_EXT) $(TEST_BASE)*.got - -$(TEST_BASE)%.$(EXE_EXT): $(TEST_DEPS) - $(LD) -o $@ $^ $(TEST_LDFLAGS) - -$(TEST_BASE)alloc.$(EXE_EXT): $(TEST_BASE)alloc.o $(PCUT_LIB) -$(TEST_BASE)asserts.$(EXE_EXT): $(TEST_BASE)asserts.o $(PCUT_LIB) -$(TEST_BASE)errno.$(EXE_EXT): $(TEST_BASE)errno.o $(PCUT_LIB) -$(TEST_BASE)manytests.$(EXE_EXT): $(TEST_BASE)manytests.o $(PCUT_LIB) -$(TEST_BASE)multisuite.$(EXE_EXT): $(TEST_BASE)suite_all.o $(TEST_BASE)suite1.o $(TEST_BASE)suite2.o $(PCUT_LIB) -$(TEST_BASE)null.$(EXE_EXT): $(TEST_BASE)null.o $(PCUT_LIB) -$(TEST_BASE)nullteardown.$(EXE_EXT): $(TEST_BASE)nullteardown.o $(PCUT_LIB) -$(TEST_BASE)printing.$(EXE_EXT): $(TEST_BASE)printing.o $(PCUT_LIB) -$(TEST_BASE)simple.$(EXE_EXT): $(TEST_BASE)simple.o $(PCUT_LIB) -$(TEST_BASE)skip.$(EXE_EXT): $(TEST_BASE)skip.o $(PCUT_LIB) -$(TEST_BASE)suites.$(EXE_EXT): $(TEST_BASE)suites.o $(PCUT_LIB) -$(TEST_BASE)teardown.$(EXE_EXT): $(TEST_BASE)teardown.o $(PCUT_LIB) -$(TEST_BASE)timeout.$(EXE_EXT): $(TEST_BASE)timeout.o $(PCUT_LIB) - - -ifeq ($(NEEDS_PREPROC),y) -$(TEST_BASE)%.o: $(TEST_BASE)%.pcut.c - $(CC) -c -o $@ $(TEST_CFLAGS) $< - -$(TEST_BASE)%.pcut.c: $(TEST_BASE)%.c $(PCUT_PREPROC) - $(CC) -E $(TEST_CFLAGS) $< | $(PCUT_PREPROC) >$@ -else -$(TEST_BASE)%.o: $(TEST_BASE)%.c - $(CC) -c -o $@ $(TEST_CFLAGS) $< -endif Index: uspace/lib/pcut/unix.mak =================================================================== --- uspace/lib/pcut/unix.mak (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ (revision ) @@ -1,100 +1,0 @@ -# -# Copyright (c) 2013 Vojtech Horky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -PCUT_TARGET_SOURCES = src/os/stdc.c src/os/unix.c -OBJ_EXT = o -PCUT_LIB = libpcut.a -PCUT_PREPROC = ./pcut.bin - -# Installation paths -PREFIX = /usr/local -LIBDIR = $(PREFIX)/lib -INCLUDEDIR = $(PREFIX)/include - --include pcut.mak - -PCUT_OBJECTS := $(addsuffix .o,$(basename $(PCUT_SOURCES))) -PCUT_PREPROC_OBJECTS := $(addsuffix .o,$(basename $(PCUT_PREPROC_SOURCES))) - -# Take care of dependencies -DEPEND = Makefile.depend --include $(DEPEND) -$(DEPEND): - makedepend -f - -Iinclude -- $(PCUT_SOURCES) >$@ 2>/dev/null - - -# -# Add the check target for running all the tests -# -TEST_BASE = tests/ -EXE_EXT = run -TEST_CFLAGS = $(PCUT_CFLAGS) -TEST_LDFLAGS = --include tests/tests.mak -TEST_APPS_BASENAMES := $(basename $(TEST_APPS)) -DIFF = diff -DIFFFLAGS = -du1 - -check: libpcut.a check-build - @for i in $(TEST_APPS_BASENAMES); do \ - echo -n ./$$i; \ - ./$$i.$(EXE_EXT) | sed 's:$(TEST_BASE)::g' >$$i.got; \ - if cmp -s $$i.got $$i.expected; then \ - echo " ok."; \ - else \ - echo " failed:"; \ - $(DIFF) $(DIFFFLAGS) $$i.expected $$i.got; \ - fi; \ - done - -# -# Clean-up -# -platform-clean: - rm -f $(DEPEND) $(PCUT_LIB) $(PCUT_PREPROC) - -# -# Actual build rules -# -$(PCUT_LIB): $(PCUT_OBJECTS) - $(AR) rc $@ $(PCUT_OBJECTS) - $(RANLIB) $@ - -$(PCUT_PREPROC): $(PCUT_PREPROC_OBJECTS) - $(LD) $(LDFLAGS) -o $@ $(PCUT_PREPROC_OBJECTS) - -%.o: $(DEPEND) - -# -# Installation -# -install: $(PCUT_LIB) - install -d -m 755 $(DESTDIR)$(LIBDIR) - install -d -m 755 $(DESTDIR)$(INCLUDEDIR)/pcut - install -m 644 $(PCUT_LIB) $(DESTDIR)$(LIBDIR)/$(PCUT_LIB) - install -m 644 include/pcut/*.h $(DESTDIR)$(INCLUDEDIR)/pcut/ Index: uspace/lib/pcut/update-from-master.sh =================================================================== --- uspace/lib/pcut/update-from-master.sh (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ uspace/lib/pcut/update-from-master.sh (revision 15d0046f9b3c481dc13462cd9c94e9f757fa743d) @@ -44,8 +44,10 @@ $RUN find -not -name update-from-master.sh -delete -$RUN wget https://github.com/vhotspur/pcut/archive/master.zip -O pcut-master.zip -$RUN unzip -u pcut-master.zip +$RUN wget -q https://github.com/vhotspur/pcut/archive/master.zip -O pcut-master.zip +$RUN unzip -q -u pcut-master.zip $RUN mv -f pcut-master/* . $RUN rm -rf pcut-master pcut-master.zip +$RUN rm -rf contrib doc +$RUN rm -f CMakeLists.txt *.cmake run_test.sh cat >Makefile <<'EOF_MAKEFILE' Index: uspace/lib/pcut/windows.mak =================================================================== --- uspace/lib/pcut/windows.mak (revision 134ac5d540e7a16b331b62d90010680153d6fbd6) +++ (revision ) @@ -1,53 +1,0 @@ -# -# Copyright (c) 2013 Vojtech Horky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -PCUT_TARGET_SOURCES = src/os/stdc.c src/os/generic.c -OBJ_EXT = obj -PCUT_LIB = pcut.lib - --include pcut.mak - -# -# Add the check target for running all the tests -# -TEST_BASE = tests/ -EXE_EXT = exe -TEST_CFLAGS = $(PCUT_CFLAGS) -TEST_LDFLAGS = -L. -lpcut --include tests/tests.mak - -# -# Clean-up -# -platform-clean: - -# -# Actual build rules -# -$(PCUT_LIB): $(PCUT_OBJECTS) -