Chris Wiggins
|
ff4b2c0908
|
Merge pull request #178 from ZoneMinder/cmake
Add cmake to ZoneMinder thanks to @mastertheknife
|
2013-09-28 03:51:00 -07:00 |
mastertheknife
|
d171578cb8
|
Fixed not logging in to mysql with a password
|
2013-09-28 13:37:36 +03:00 |
|
mastertheknife
|
3321f26408
|
Modified .travis.yml to include kylejohnson's changes and fix it
|
2013-09-28 13:32:43 +03:00 |
|
mastertheknife
|
db48a3d8fb
|
Add matrix to the .travis.yml file
|
2013-09-28 13:04:41 +03:00 |
|
mastertheknife
|
48f11a8064
|
Add cmake to zoneminder
|
2013-09-28 12:59:50 +03:00 |
Kyle Johnson
|
598e830659
|
SQL syntax error in travis test monitor
|
2013-09-27 15:56:06 -04:00 |
|
Kyle Johnson
|
2c64c5d2be
|
SQL syntax error in travis test monitor
|
2013-09-27 15:43:05 -04:00 |
|
Kyle Johnson
|
70841d32ab
|
Use only the needed fields for the travis test cam
|
2013-09-27 15:31:07 -04:00 |
|
Kyle Johnson
|
de59dd8f10
|
Proper number of columns 1.26.3 for travis
|
2013-09-27 14:25:03 -04:00 |
|
Kyle Johnson
|
a5e526d788
|
Assign a monitor ID of 500 to the test monitor for the travis builds
|
2013-09-27 13:58:47 -04:00 |
|
Kyle Johnson
|
9ac52b4a52
|
Replace the ZM_DB_PASS with an empty password for the travis test steps
|
2013-09-27 13:49:33 -04:00 |
|
Kyle Johnson
|
564fa216f8
|
Use the default travis user without a password
|
2013-09-27 13:32:38 -04:00 |
|
Kyle Johnson
|
cd902b5dc1
|
Create the database for travis during the before_script step
|
2013-09-27 13:08:45 -04:00 |
|
Kyle Johnson
|
27349f87a6
|
Only grab the last 10 revisions and the master branch of ffmpeg for travis
|
2013-09-27 12:56:27 -04:00 |
|
Kyle Johnson
|
8983807570
|
Output apt-get install to /dev/null in travis - we don't care about it
|
2013-09-27 12:49:44 -04:00 |
|
Kyle Johnson
|
fc6731e575
|
Create and use a dedicated ZM database user for the travis build steps
|
2013-09-27 12:46:16 -04:00 |
|
Kyle Johnson
|
167eff56be
|
Removed verbosity, extra db creation from travis build steps and fixed a db name
|
2013-09-27 10:59:11 -04:00 |
|
Kyle Johnson
|
beee057dd2
|
More work on the travis build steps
|
2013-09-27 10:48:00 -04:00 |
|
Kyle Johnson
|
44f4e2f981
|
Added a few steps to help me see the travis CI environment
|
2013-09-27 10:38:54 -04:00 |
|
Kyle Johnson
|
186b1c3836
|
Use the right database name
|
2013-09-27 09:59:23 -04:00 |
|
Kyle Johnson
|
3119ab7672
|
Added steps to install ZM binaries, insert a monitor and start ZM
|
2013-09-27 09:47:58 -04:00 |
|
mastertheknife
|
dddec742e0
|
Fixed zm_logger not including zm_config.h first.
|
2013-09-25 09:00:52 +03:00 |
|
mastertheknife
|
e8d20faec8
|
Proper checking for sys/syscall.h
|
2013-09-25 07:11:59 +03:00 |
|
Kyle Johnson
|
617cbc0edb
|
Tell Travis to skip building the modern branch for now [skip ci]
|
2013-09-24 20:39:34 -04:00 |
|
Kfir Itzhak
|
171bf4ab3f
|
Merge pull request #172 from raulcaj/patch-1
Solution for Issue #170
|
2013-09-24 13:25:15 -07:00 |
Raul Almeida
|
f2225f23cd
|
Update zm_thread.h
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
|
2013-09-24 17:07:36 -03:00 |
|
Raul Almeida
|
aeed1d4043
|
Update zm_timer.h
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
|
2013-09-24 17:03:36 -03:00 |
|
mastertheknife
|
aef9ab2f00
|
Removed NumCoords entirely from zm_zone.cpp
|
2013-09-24 07:41:37 +03:00 |
|
mastertheknife
|
ac7f7f08a7
|
Fix some compilation warnings
|
2013-09-24 07:31:02 +03:00 |
|
mastertheknife
|
c526fcedd7
|
Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors
|
2013-09-24 07:15:37 +03:00 |
|
Kyle Johnson
|
0b4292237b
|
Upgrade and install preqs quietly
|
2013-09-23 16:05:56 -04:00 |
|
Kyle Johnson
|
87f0ba6c8e
|
Added travis build status image to readme [ci skip]
|
2013-09-23 13:21:29 -04:00 |
|
Kyle Johnson
|
fa805ac7bd
|
Revert "Removed libtheora, libvorbis, libvpx and libx264 from apt dependencies."
This reverts commit fb43fdf04d.
|
2013-09-23 13:14:23 -04:00 |
|
Kyle Johnson
|
fb43fdf04d
|
Removed libtheora, libvorbis, libvpx and libx264 from apt dependencies.
These libs should be installed from source as part of ffmpeg.
|
2013-09-23 12:20:43 -04:00 |
|
Kyle Johnson
|
50122f09b1
|
Split out the zoneminder build options into individual steps
|
2013-09-23 12:18:17 -04:00 |
|
Kyle Johnson
|
88a9b434ff
|
Split out the ffmpeg build options into individual steps
|
2013-09-23 12:17:59 -04:00 |
|
Kyle Johnson
|
f2c58acd94
|
Added missing build steps to generate build files to .travis.yml
|
2013-09-23 09:59:47 -04:00 |
|
Kyle Johnson
|
aa5290ce3f
|
Found an env variable to put me where I want to be
|
2013-09-23 09:51:40 -04:00 |
|
Kyle Johnson
|
c5eb83c4f7
|
Use pushd and popd to move between ffmpeg and zoneminder
|
2013-09-23 09:48:30 -04:00 |
|
Kyle Johnson
|
6f9fa0debf
|
Run as many make jobs as there are CPUs for the ffmpeg build
|
2013-09-23 09:26:22 -04:00 |
|
Kyle Johnson
|
2dce96f4e7
|
Trying to find the correct directory where the ZM clone lives
|
2013-09-23 09:22:44 -04:00 |
Kyle Johnson
|
df13eb1242
|
Merge pull request #162 from knnniggett/streaming
Improve Chrome browser support & log streaming events
|
2013-09-23 06:15:46 -07:00 |
|
Kyle Johnson
|
304065cd51
|
Merge pull request #163 from knnniggett/fedora
Add fedora rpm development files to zoneminder source tree
|
2013-09-23 06:10:17 -07:00 |
|
Kyle Johnson
|
3e7f7621c1
|
cd back into the ZM dir, and run make after config
|
2013-09-23 08:51:31 -04:00 |
|
Kyle Johnson
|
f4311ff13d
|
Added IRC notifications to .travis.yml
|
2013-09-23 08:33:02 -04:00 |
|
Kyle Johnson
|
e438714aea
|
Initial commit of .travis.yml file, hopefully this builds.
|
2013-09-23 08:28:10 -04:00 |
Knniggett
|
b4da026bdf
|
Add fedora files to zoneminder source tree
|
2013-09-21 16:36:00 -05:00 |
|
Knniggett
|
6d00540b5d
|
Improve Chrome browser support & log streaming events
|
2013-09-21 14:52:41 -05:00 |
Isaac Connor
|
b80ac24c76
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2013-09-18 13:00:06 -04:00 |
|
Isaac Connor
|
eba8b0dde0
|
move this into the distros dir
|
2013-09-18 12:51:10 -04:00 |