LADI
/
porg
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undone change in r184 

git-svn-id: https://svn.code.sf.net/p/porg/code/trunk@185 8854956c-c02d-4db9-8198-7e99b8e08f37
This commit is contained in:
davidrr 2017-01-17 15:26:19 +00:00
parent e5c8263ba7
commit 025430a562
14 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -54,5 +54,4 @@ Kardakov Slava
R.J.V. Bertin
Tomoaki Nishiyama
Alain Bureau
Michael Uplawski

6
Makefile.am
View File

@ -29,16 +29,16 @@ logme_files = \
logme:
@echo "'make logme' is no longer required to log the own porg installation."
@echo "Try 'sudo porg -lp porg-$(PORG_VERSION) make install' instead."
@echo "Try 'sudo porg -lp porg-$(PACKAGE_VERSION) make install' instead."
@echo "If it fails, try 'sudo make logme-really' and report it, please."
## A rule to log the own porg's installation
logme-really:
ls $(logme_files) | porg -lp porg-$(PORG_VERSION) && \
ls $(logme_files) | porg -lp porg-$(PACKAGE_VERSION) && \
for dir in $(SUBDIRS); do \
( cd $$dir && $(MAKE) logme ) 2>/dev/null; \
done && \
echo && porg -vvxfsty porg-$(PORG_VERSION)
echo && porg -vvxfsty porg-$(PACKAGE_VERSION)
README: doc/index.html
html2text $< | $(SED) 's/&ast;/*/g' > README

19
configure.ac
View File

@ -2,7 +2,10 @@
# Process this file with autoconf to produce a configure script.
#
AC_INIT([porg],[[]],[http://porg.sourceforge.net])
AC_INIT([porg],[svn],[http://porg.sourceforge.net])
#RELEASEDATE="17 May 2016"
RELEASEDATE="`date +'%d %B %Y'`"
AC_CONFIG_SRCDIR([porg/main.cc])
AC_CONFIG_HEADERS([config.h])
@ -37,22 +40,13 @@ AC_USE_SYSTEM_EXTENSIONS
# Set configure options
#=======================
if test -z "$PACKAGE_VERSION"; then
# development
PORG_VERSION="r`svn info --show-item revision | sed 's/ *//g'`"
if echo "$PACKAGE_VERSION" | grep -q svn; then
AC_DEFINE([GTK_DISABLE_DEPRECATED], [1], [Disable gtkmm-2.4 API])
else
# stable release
PORG_VERSION="$PACKAGE_VERSION"
AC_DEFINE([NDEBUG], [1], [Disable libc assertions])
## AC_DEFINE([G_DISABLE_ASSERT], [1], [Disable glib assertions])
fi
AC_DEFINE_UNQUOTED([PORG_VERSION], ["$PORG_VERSION"], [Release version])
AC_SUBST([PORG_VERSION])
RELEASEDATE="`date +'%d %B %Y'`"
AC_DEFINE_UNQUOTED([RELEASEDATE], ["$RELEASEDATE"], [Release date])
AC_SUBST([RELEASEDATE])
@ -129,8 +123,7 @@ if test "$GXX" = yes; then
MY_CXXFLAGS="$MY_CXXFLAGS -ansi -pedantic -Wall -fno-operator-names -std=c++11 -Wno-deprecated-declarations"
fi
if test -z "$PACKAGE_VERSION"; then
# on development enable -Werror flag
if echo "$PACKAGE_VERSION" | grep -q svn; then
MY_CFLAGS="$MY_CFLAGS -Werror"
MY_CXXFLAGS="$MY_CXXFLAGS -Werror"
fi

4
doc/Makefile.am
View File

@ -70,8 +70,8 @@ install-data-local: porgrc
touch $$rc_file
logme:
ls $(logme_files) | porg -lp+ porg-$(PORG_VERSION) && \
$(SED) -i "s|^#i:.*|#i:$(porg_icon_path)|" $(logdir)/porg-$(PORG_VERSION)
ls $(logme_files) | porg -lp+ porg-$(PACKAGE_VERSION) && \
$(SED) -i "s|^#i:.*|#i:$(porg_icon_path)|" $(logdir)/porg-$(PACKAGE_VERSION)
web: index.html
scp $< davidrr,porg@web.sourceforge.net:htdocs/

2
doc/porg.8.in
View File

@ -4,7 +4,7 @@
.\" Copyright (C) 2015 David Ricart <@PACKAGE_BUGREPORT@>
.\"----------------------------------------------------------------
.\"
.TH PORG "8" "@RELEASEDATE@" "porg @PORG_VERSION@" "System"
.TH PORG "8" "@RELEASEDATE@" "porg @PACKAGE_VERSION@" "System"
.SH NAME
porg - a source code package organizer
.SH SYNOPSIS

2
doc/porgball.8.in
View File

@ -4,7 +4,7 @@
.\" Copyright (C) 2015 David Ricart <@PACKAGE_BUGREPORT@>
.\"----------------------------------------------------------------
.\"
.TH PORGBALL "8" "@RELEASEDATE@" "porg @PORG_VERSION@" "System"
.TH PORGBALL "8" "@RELEASEDATE@" "porg @PACKAGE_VERSION@" "System"
.SH NAME
porgball - Binary package support for porg(8).
.SH SYNOPSIS

2
doc/porgrc.5.in
View File

@ -4,7 +4,7 @@
.\" Copyright (C) 2015 David Ricart <@PACKAGE_BUGREPORT@>
.\"----------------------------------------------------------------
.TH porgrc "5" "@RELEASEDATE@" "porg @PORG_VERSION@" "System"
.TH porgrc "5" "@RELEASEDATE@" "porg @PACKAGE_VERSION@" "System"
.SH NAME
porgrc - configuration file for porg
.SH SYNOPSIS

2
grop/Makefile.am
View File

@ -52,7 +52,7 @@ logme_files = \
$(DESTDIR)$(bindir)/grop
logme:
ls $(logme_files) | porg -lp+ porg-$(PORG_VERSION)
ls $(logme_files) | porg -lp+ porg-$(PACKAGE_VERSION)
else

2
grop/mainwindow.cc
View File

@ -223,7 +223,7 @@ void MainWindow::on_about()
dialog.set_transient_for(*this);
dialog.set_name("grop");
dialog.set_logo_default();
dialog.set_version("Version " PORG_VERSION " (" RELEASEDATE ")");
dialog.set_version("Version " PACKAGE_VERSION " (" RELEASEDATE ")");
dialog.set_comments("Graphic interface of porg,\na source code package organizer");
dialog.set_authors(std::vector<Glib::ustring>(1, "David Ricart"));
dialog.set_website(PACKAGE_BUGREPORT);

2
lib/porg-log/Makefile.am
View File

@ -8,4 +8,4 @@ libporg_log_la_CFLAGS = \
$(MY_CFLAGS)
logme:
ls $(DESTDIR)$(libdir)/libporg-log* | porg -lp+ porg-$(PORG_VERSION)
ls $(DESTDIR)$(libdir)/libporg-log* | porg -lp+ porg-$(PACKAGE_VERSION)

2
lib/porg/basepkg.cc
View File

@ -167,7 +167,7 @@ void BasePkg::write_log() const
// write info header
of << "#!porg-" PORG_VERSION "\n"
of << "#!porg-" PACKAGE_VERSION "\n"
<< '#' << CODE_DATE << ':' << m_date << '\n'
<< '#' << CODE_SIZE << ':' << std::setprecision(0) << std::fixed << m_size << '\n'
<< '#' << CODE_NFILES << ':' << m_nfiles << '\n'

2
porg/Makefile.am
View File

@ -36,5 +36,5 @@ logme_files = \
$(DESTDIR)$(bindir)/porg
logme:
ls $(logme_files) | porg -lp+ porg-$(PORG_VERSION)
ls $(logme_files) | porg -lp+ porg-$(PACKAGE_VERSION)

2
porg/opt.cc
View File

@ -460,7 +460,7 @@ cout <<
static void version()
{
cout << "porg-" PORG_VERSION " (" RELEASEDATE ")\n"
cout << "porg-" PACKAGE_VERSION " (" RELEASEDATE ")\n"
"Written by David Ricart <" PACKAGE_BUGREPORT ">" << endl;
exit(EXIT_SUCCESS);

2
scripts/Makefile.am
View File

@ -18,5 +18,5 @@ logme_files = \
$(DESTDIR)$(bindir)/porgball
logme:
ls $(logme_files) | porg -lp+ porg-$(PORG_VERSION)
ls $(logme_files) | porg -lp+ porg-$(PACKAGE_VERSION)