Skip to content

Commit 4dd4f27

Browse files
revmischarevmischa
authored
Install presets/fonts/shaders/config (#35)
* install wip * fix data dir * test install in travis * install presets * fix local install path * adding header files to SOURCES for dist * ignore dist pkg * dist headers, test dist build * travis test stuff * include test * build status * formatting * tar fix for long file names from @abramhindle
1 parent 7b5fcd8 commit 4dd4f27

File tree

10 files changed

+80
-17
lines changed

10 files changed

+80
-17
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ project.xcworkspace
88
*.lo
99
*.la
1010
*.a
11+
projectM-*.tar.gz
1112
.deps/
1213
.libs/
1314
Makefile

‎.travis.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,18 @@ before_script: ./autogen.sh
44
before_install:
55
- eval "${MATRIX_EVAL}"
66

7-
script: ./configure && make -j8
7+
script:
8+
- ./configure --prefix=$PWD/local && make -j8 && make install # build from checkoout
9+
- make dist && tar -zxf projectM-*.tar.gz && cd projectM-* && ./configure --prefix=$PWD/local && make -j8 && make install # build from dist\
10+
- echo "PWD $PWD"
11+
- ls .
12+
- test -e src/projectM-sdl/projectMSDL
13+
- test -e src/libprojectM/libprojectM.la
14+
- test -e local/share/projectM/fonts/Vera.ttf
15+
- test -e local/share/projectM/shaders/blur.cg
16+
- test -d local/share/projectM/presets
17+
- test -e local/lib/libprojectM.la
18+
- test -e local/include/projectM.hpp
819

920
# test on GCC and Clang
1021
matrix:

‎Makefile.am‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
SUBDIRS=src
2-
EXTRA_DIST=README.md AUTHORS.txt
2+
PRESETSDIR = presets
3+
EXTRA_DIST=README.md AUTHORS.txt presets fonts src/libprojectM/Renderer/blur.cg src/libprojectM/Renderer/projectM.cg $(PRESETSDIR)
34
CLEANFILES=
45

5-
pm_data_dir = @datarootdir@
6+
# aka /usr/local/share/projectM
7+
pm_data_dir = $(pkgdatadir)
68
pm_font_dir = $(pm_data_dir)/fonts
79
pm_presets_dir = $(pm_data_dir)/presets
810
pm_shaders_dir = $(pm_data_dir)/shaders
911

10-
pm_font__DATA = fonts
11-
pm_presets__DATA = presets
12+
# files to install
13+
pm_data__DATA = src/libprojectM/config.inp
14+
pm_font__DATA = fonts/Vera.ttf fonts/VeraMono.ttf
1215
pm_shaders__DATA = src/libprojectM/Renderer/blur.cg \
13-
src/libprojectM/Renderer/projectM.cg
16+
src/libprojectM/Renderer/projectM.cg
17+
18+
# find and install all preset files
19+
install-data-local:
20+
test -z $(pkgdatadir) || $(MKDIR_P) $(pm_presets_dir)
21+
find "$(PRESETSDIR)" -type f -exec $(INSTALL_DATA) {} $(pm_presets_dir) \;

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![Build Status](https://travis-ci.org/projectM-visualizer/projectm.svg?branch=master)](https://travis-ci.org/projectM-visualizer/projectm)
2+
13
![Logo](https://github.com/projectM-visualizer/projectm/raw/master/web/logo.png)
24

35
## projectM - The most advanced open-source music visualizer
@@ -87,6 +89,7 @@ We're on IRC at irc.freenode.net #projectM
8789

8890
## Authors
8991
[Authors](https://github.com/projectM-visualizer/projectm/raw/master/AUTHORS.txt)
92+
9093
If you would like to help improve this project, either with documentation, code, porting, hardware or anything else please let us know! We gladly accept pull requests and issues.
9194

9295
## License

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_INIT([projectM], [2.0.0], [[email protected]], [projectM], [https://github.com/revmischa/projectm])
2-
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
2+
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax])
33

44
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
55
LT_INIT

‎src/libprojectM/Makefile.am‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ AM_CPPFLAGS = \
1212
# system headers/libraries/data to install
1313
include_HEADERS = projectM.hpp
1414
lib_LTLIBRARIES = libprojectM.la # public, possibly-shared library
15-
dist_pkgdata_DATA = config.inp
1615

1716
# link flags
1817
libprojectM_la_LDFLAGS = -no-undefined -version-info 0:2:0
@@ -24,9 +23,28 @@ $(top_srcdir)/src/libprojectM/NativePresetFactory/libNativePresetFactory.la \
2423
$(top_srcdir)/src/libprojectM/Renderer/libRenderer.la
2524
libprojectM_la_SOURCES = ConfigFile.cpp Preset.cpp PresetLoader.cpp timer.cpp \
2625
KeyHandler.cpp PresetChooser.cpp TimeKeeper.cpp PCM.cpp PresetFactory.cpp \
27-
fftsg.cpp wipemalloc.cpp PipelineMerger.cpp PresetFactoryManager.cpp projectM.cpp
26+
fftsg.cpp wipemalloc.cpp PipelineMerger.cpp PresetFactoryManager.cpp projectM.cpp \
27+
Common.hpp PipelineMerger.hpp PresetLoader.hpp\
28+
HungarianMethod.hpp Preset.hpp RandomNumberGenerators.hpp\
29+
IdleTextures.hpp PresetChooser.hpp TimeKeeper.hpp\
30+
KeyHandler.hpp PresetFactory.hpp projectM.hpp\
31+
PCM.hpp PresetFactoryManager.hpp\
32+
projectM.hpp \
33+
ConfigFile.h glew.h\
34+
carbontoprojectM.h glxew.h\
35+
cocoatoprojectM.h lvtoprojectM.h\
36+
dlldefs.h resource.h\
37+
event.h sdltoprojectM.h\
38+
fatal.h timer.h\
39+
fftsg.h win32-dirent.h\
40+
glError.h wipemalloc.h\
41+
omptl/omptl_numeric_extentions_ser.h\
42+
omptl/omptl_algorithm_par.h omptl/omptl_numeric_par.h\
43+
omptl/omptl_algorithm_ser.h omptl/omptl_numeric_ser.h\
44+
omptl/omptl_numeric_extentions.h omptl/omptl_tools.h\
45+
omptl/omptl_numeric_extentions_par.h omptl/omptl omptl/omptl_numeric\
46+
omptl/omptl_algorithm
2847

29-
pkginclude_HEADERS = projectM.hpp
3048
pkgconfigdir = $(libdir)/pkgconfig
3149
# pkgconfig_DATA = src/libprojectM.pc
3250
# EXTRA_DIST += src/libprojectM.pc.in

‎src/libprojectM/MilkdropPresetFactory/Makefile.am‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@ BuiltinFuncs.cpp Func.cpp BuiltinParams.cpp IdlePreset.cpp Parser.cpp \
55
InitCond.cpp PerFrameEqn.cpp CustomShape.cpp \
66
PerPixelEqn.cpp CustomWave.cpp MilkdropPreset.cpp PerPointEqn.cpp \
77
Eval.cpp MilkdropPresetFactory.cpp PresetFrameIO.cpp \
8-
Expr.cpp Param.cpp
8+
Expr.cpp Param.cpp \
9+
BuiltinFuncs.hpp Func.hpp ParamUtils.hpp\
10+
BuiltinParams.hpp IdlePreset.hpp Parser.hpp\
11+
CValue.hpp InitCond.hpp PerFrameEqn.hpp\
12+
CustomShape.hpp InitCondUtils.hpp PerPixelEqn.hpp\
13+
CustomWave.hpp MilkdropPreset.hpp PerPointEqn.hpp\
14+
Eval.hpp MilkdropPresetFactory.hpp PresetFrameIO.hpp\
15+
Expr.hpp Param.hpp
916

17+
:
1018
libMilkdropPresetFactory_la_CPPFLAGS = ${my_CFLAGS} \
1119
-I$(top_srcdir)/src/libprojectM

‎src/libprojectM/NativePresetFactory/Makefile.am‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ noinst_LTLIBRARIES=libNativePresetFactory.la
22

33
libNativePresetFactory_la_SOURCES= \
44
NativePreset.hpp NativePresetFactory.hpp \
5-
MilkdropCompatability.hpp NativePresetFactory.cpp
5+
MilkdropCompatability.hpp NativePresetFactory.cpp \
6+
MilkdropCompatability.hpp NativePreset.hpp NativePresetFactory.hpp
67

78
libNativePresetFactory_la_CPPFLAGS = ${my_CFLAGS} \
89
-I$(top_srcdir)/src/libprojectM
9-
10-

‎src/libprojectM/Renderer/Makefile.am‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,23 @@ libRenderer_la_SOURCES = \
2222
TextureManager.cpp \
2323
VideoEcho.cpp \
2424
RenderItemDistanceMetric.cpp \
25-
RenderItemMatcher.cpp
25+
RenderItemMatcher.cpp \
26+
BeatDetect.hpp PipelineContext.hpp ShaderEngine.hpp\
27+
FBO.hpp RenderItemDistanceMetric.hpp TextureManager.hpp\
28+
Filters.hpp RenderItemMatcher.hpp Transformation.hpp\
29+
MilkdropWaveform.hpp RenderItemMergeFunction.hpp UserTexture.hpp\
30+
PerPixelMesh.hpp Renderable.hpp VideoEcho.hpp\
31+
PerlinNoise.hpp Renderer.hpp Waveform.hpp\
32+
Pipeline.hpp Shader.hpp\
33+
SOIL2/SOIL2.h SOIL2/stbi_DDS.h\
34+
SOIL2/etc1_utils.h SOIL2/stbi_DDS_c.h\
35+
SOIL2/image_DXT.h SOIL2/stbi_ext.h\
36+
SOIL2/image_helper.h SOIL2/stbi_ext_c.h\
37+
SOIL2/pkm_helper.h SOIL2/stbi_pkm.h\
38+
SOIL2/pvr_helper.h SOIL2/stbi_pkm_c.h\
39+
SOIL2/stb_image.h SOIL2/stbi_pvr.h\
40+
SOIL2/stb_image_write.h SOIL2/stbi_pvr_c.h
41+
2642

2743
libRenderer_la_CPPFLAGS = ${my_CFLAGS} \
2844
-I$(top_srcdir)/src/libprojectM
29-

‎src/projectM-sdl/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ AM_CFLAGS = ${my_CFLAGS} \
1111
-fdata-sections
1212

1313
bin_PROGRAMS = projectMSDL
14-
projectMSDL_SOURCES = pmSDL.cpp projectM_SDL_main.cpp
14+
projectMSDL_SOURCES = pmSDL.cpp projectM_SDL_main.cpp pmSDL.hpp
1515
projectMSDL_LDADD = ${SDL_LIBS} ${top_srcdir}/src/libprojectM/libprojectM.la
1616
projectMSDL_LDFLAGS = -static
1717
projectMSDL_PROGRAM = projectMSDL

0 commit comments

Comments
 (0)