Skip to content

Commit

Permalink
Update repository.
Browse files Browse the repository at this point in the history
  • Loading branch information
Asubayo committed Sep 26, 2015
1 parent 5931de4 commit 4bee5fe
Show file tree
Hide file tree
Showing 15 changed files with 185 additions and 60 deletions.
File renamed without changes.
52 changes: 52 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#
# Makefile.am
#
# src Makefile.am. Process this file with automake to generate a Makefile
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#*
#* This file part of: FreeTure
#*
#* Copyright: (C) 2014-2015 Yoan Audureau, Chiara Marmo
#* FRIPON-GEOPS-UPSUD-CNRS
#*
#* License: GNU General Public License
#*
#* FreeTure is free software: you can redistribute it and/or modify
#* it under the terms of the GNU General Public License as published by
#* the Free Software Foundation, either version 3 of the License, or
#* (at your option) any later version.
#* FreeTure is distributed in the hope that it will be useful,
#* but WITHOUT ANY WARRANTY; without even the implied warranty of
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#* GNU General Public License for more details.
#* You should have received a copy of the GNU General Public License
#* along with FreeTure. If not, see <http://www.gnu.org/licenses/>.
#*
#* Last modified: 20/01/2015
#*
#*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

AUTOMAKE_OPTIONS = foreign no-dependencies
SUBDIRS = doc src
dist_pkgdata_DATA = share/configuration.cfg
EXTRA_DIST = README NEWS INSTALL acx_boost.m4 acx_cfitsio.m4 \
acx_opencv.m4 acx_pylon.m4 acx_urbi_resolve_dir.m4 \
bootstrap.sh THANKS
#RPM_ROOTDIR = `rpmbuild --nobuild -E %_topdir`
#RPM_SRCDIR = $(RPM_ROOTDIR)/SOURCES
#dist-hook:
# rm -rf `find $(distdir) -name .svn`

#rpm: dist
# cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
# rpmbuild -ba --clean $(PACKAGE_NAME).spec

#rpm-icc: dist
# cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
# USE_ICC="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec

#rpm-best: dist
# cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz $(RPM_SRCDIR)
# USE_BEST="1" rpmbuild -ba --clean --nodeps $(PACKAGE_NAME).spec


File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
57 changes: 0 additions & 57 deletions autotools/Makefile.am

This file was deleted.

File renamed without changes.
9 changes: 6 additions & 3 deletions autotools/configure.ac → configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ define([AC_CACHE_SAVE],)

AC_PREREQ([2.69])
AC_INIT([freeture], [0.8-3], [[email protected]])
AC_CONFIG_SRCDIR([../src/main.cpp])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([config.h])

AM_INIT_AUTOMAKE
Expand Down Expand Up @@ -231,7 +231,10 @@ AC_MSG_RESULT([Link cmdline: $CC $AM_LDFLAGS $LDFLAGS $LIBS])
AC_MSG_RESULT([***************************************************************])

AC_CONFIG_FILES([Makefile
README
INSTALL
README
INSTALL
doc/Makefile
doc/freeture.1
src/Makefile
])
AC_OUTPUT
28 changes: 28 additions & 0 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#
# Makefile.am
#
# src Makefile.am. Process this file with automake to generate a Makefile
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#*
#* This file part of: freeture
#*
#* Copyright: (C) 2014 Yoan Audureau -- FRIPON-GEOPS-UPSUD
#*
#* License: GNU General Public License
#*
#* FreeTure is free software: you can redistribute it and/or modify
#* it under the terms of the GNU General Public License as published by
#* the Free Software Foundation, either version 3 of the License, or
#* (at your option) any later version.
#* FreeTure is distributed in the hope that it will be useful,
#* but WITHOUT ANY WARRANTY; without even the implied warranty of
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#* GNU General Public License for more details.
#* You should have received a copy of the GNU General Public License
#* along with FreeTure. If not, see <http://www.gnu.org/licenses/>.
#*
#* Last modified: 23/05/2014
#*
#*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

dist_man_MANS = freeture.1 freeture.x
47 changes: 47 additions & 0 deletions doc/freeture.1.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
.TH FREETURE "1" "@DATE3@" "FREETURE @PACKAGE_VERSION@" "User Commands"
.SH NAME
freeture \- performs image acquisition and meteor detection .SH SYNOPSIS
.B scamp
\fIcatalog1\fR [\fIcatalog2 ...\fR][\fI@catalog_list1\fR [\fI@catalog_list2 ...\fR]]
.RS
[\fI-c configuration-file\fR][\fI-param1 value1 -param2 value2 ...\fR]
.RE
.TP
.B scamp \fI-d\fR
.SH DESCRIPTION
freeture is a software that performs image acquisition and meteor detection
.RE
See http://fripon.github.io/freeture for more details.
.SS "Operation modes:"
.TP
\fB\-h\fR, \fB\-\-help\fR
print this help, then exit
.TP
\fB\-V\fR, \fB\-\-version\fR
print version number, then exit
.TP
\fB\-d\fR, \fB\-\-dump\fR
dump a default configuration file
.TP
\fB\-dd\fR, \fB\-\-ddump\fR
dump an extended default configuration file
.SH MANUAL
The full documentation for
.B SCAMP
is maintained as a PDF manual available at
.B http://fripon.github.io/freeture
.SH "REPORTING BUGS"
Please report bugs to ...
.SH "SEE ALSO"
.BR
.SH AUTHORS
Written by Yoan Audureau (Geosciences Paris Sud)
.PP
.SH LICENSE
freeture is licensed under the terms of the General Public License (GPL),
version 3.
.SH COPYRIGHT
.PP
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

2 changes: 2 additions & 0 deletions doc/freeture.x
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[name]
freeture \- performs image acquisition and meteor detection
50 changes: 50 additions & 0 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#
# Makefile.am
#
# src Makefile.am. Process this file with automake to generate a Makefile
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#*
#* This file part of: freeture
#*
#* Copyright: (C) 2014-2015 Yoan Audureau, Chiara Marmo
#* FRIPON-GEOPS-UPSUD-CNRS
#*
#* License: GNU General Public License
#*
#* FreeTure is free software: you can redistribute it and/or modify
#* it under the terms of the GNU General Public License as published by
#* the Free Software Foundation, either version 3 of the License, or
#* (at your option) any later version.
#* FreeTure is distributed in the hope that it will be useful,
#* but WITHOUT ANY WARRANTY; without even the implied warranty of
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#* GNU General Public License for more details.
#* You should have received a copy of the GNU General Public License
#* along with FreeTure. If not, see <http://www.gnu.org/licenses/>.
#*
#* Last modified: 20/10/2014
#*
#*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

bin_PROGRAMS = freeture
freeture_SOURCES = EImgBitDepth.h ECamType.h EParser.h EParser.cpp \
EDetMeth.h Base64.h Camera.h AcqThread.h AcqThread.cpp \
CameraVideo.h CameraGigeAravis.h CameraGigeAravis.cpp \
CameraFrames.h CameraGigePylon.h CameraGigePylon.cpp CameraV4l2.cpp CameraV4l2.h \
SMTPClient.h CameraGigeTis.h CameraGigeTis.cpp Circle.h \
Configuration.h Conversion.h DetThread.h Detection.h \
Fits.h Fits2D.h Fits3D.h Frame.h GlobalEvent.h Histogram.h DetectionTemplate.h \
LocalEvent.h EStackMeth.h DetectionTemplate.cpp DetectionTemporal.h DetectionTemporal.cpp \
TimeDate.h Device.h Device.cpp Stack.h Stack.cpp Ephemeris.cpp \
SaveImg.h ECamBitDepth.h StackThread.h StackThread.cpp \
Base64.cpp ESmtpSecurity.h OpenSSL.h OpenSSL.cpp Socket.h \
CameraFrames.cpp SMTPClient.cpp HistogramGray.h HistogramGray.cpp \
CameraVideo.cpp Configuration.cpp Conversion.cpp Ephemeris.h \
DetThread.cpp Fits.cpp Fits2D.cpp Fits3D.cpp Logger.h \
Frame.cpp GlobalEvent.cpp Histogram.cpp AcqSchedule.h AcqSchedule.cpp \
LocalEvent.cpp main.cpp HistogramRGB.h HistogramRGB.cpp EImgFormat.h \
TimeDate.cpp ExposureControl.cpp ExposureControl.h ETimeMode.h \
SaveImg.cpp ELogSeverityLevel.h ImgProcessing.cpp ImgProcessing.h

DATE=`date +"%Y-%m-%d"`

0 comments on commit 4bee5fe

Please sign in to comment.