sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-05 00:09:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

** fixed qgiscommit (didn't work when in qgis root)

Browse Source 
** cosmetics for qgis-config to be more "standardconform"


git-svn-id: http://svn.osgeo.org/qgis/trunk@1153 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jobi 2004-04-04 22:53:48 +00:00
parent d7be87e328
commit 58aafaf055
5 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,8 +1,12 @@
QGIS Change Log
ChangeLog,v 1.53 2004/04/04 15:27:33 jobi Exp
ChangeLog,v 1.54 2004/04/04 22:53:47 jobi Exp
------------------------------------------------------------------------------
Version 0.2 'Pumpkin' .... development version
2004-04-05 [jobi] 0.1.0devel30
** fixed qgiscommit (didn't work when in qgis root)
** cosmetics for qgis-config to be more "standardconform"
2004-04-04 [jobi] 0.1.0devel29
** fixed GRASS provider

4
configure.in
View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
dnl configure.in,v 1.52 2004/04/04 15:27:33 jobi Exp
dnl configure.in,v 1.53 2004/04/04 22:53:47 jobi Exp
AC_INIT
@ -23,7 +23,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=1
MICRO_VERSION=0
EXTRA_VERSION=29
EXTRA_VERSION=30
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else

5
tools/qgis_config/Makefile.am
View File

@ -12,11 +12,12 @@ PREFIX=-DPREFIX=\"$(prefix)\"
INCLUDE_DIR=-DINCLUDE_DIR=\"${prefix}/include\"
LIB_DIR=-DLIB_DIR=\"${libdir}\"
BIN_DIR=-DBIN_DIR=\"${exec_prefix}/bin\"
PLUGIN_DIR=-DPLUGIN_DIR=\"${pkglibdir}\"
## main app
bin_PROGRAMS = qgis_config
bin_PROGRAMS = qgis-config
## ancillary library for plug-ins
qgis_config_SOURCES = qgis_config.cpp
qgis_config_CXXFLAGS = $(PREFIX) $(INCLUDE_DIR) $(LIB_DIR) $(BIN_DIR) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(DEBUG_QGIS)
qgis_config_CXXFLAGS = $(PREFIX) $(INCLUDE_DIR) $(LIB_DIR) $(BIN_DIR) $(PLUGIN_DIR) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(DEBUG_QGIS)

29
tools/qgis_config/qgis_config.cpp
View File

@ -33,9 +33,12 @@ void usage()
"Usage:\n " <<
" qgis_config OPTION...\n\n" <<
"Options:\n" <<
" --bindir show location of executable(s)\n" <<
" --includedir show location of C++ header files\n" <<
" --libdir show location of installed libraries\n" <<
" --bindir print destination of executable(s)\n" <<
" --cflags print the compiler flags that are necessary to\n" <<
" compile a plug-inshow location of C++ header files\n" <<
" --libs print the linker flags that are necessary to link a\n" <<
" plug-in\n" <<
" --plugindir print the path where the plugins are installed\n" <<
" --help show this help, then exit\n"
<< std::endl;
}
@ -57,8 +60,9 @@ int main(int argc, char **argv)
* We distinguish them by their indices. */
{"prefix", no_argument, 0, 'p'},
{"bindir", no_argument, 0, 'b'},
{"includedir", no_argument, 0, 'i'},
{"libdir", no_argument, 0, 'l'},
{"cflags", no_argument, 0, 'c'},
{"libs", no_argument, 0, 'l'},
{"plugindir", no_argument, 0, 'w'},
{0, 0, 0, 0}
};
// If no argument is given, show hint
@ -74,7 +78,7 @@ int main(int argc, char **argv)
/* getopt_long stores the option index here. */
int option_index = 0;
optionChar = getopt_long (argc, argv, "pbil",
optionChar = getopt_long (argc, argv, "pbclw",
long_options, &option_index);
/* Detect the end of the options. */
@ -91,11 +95,18 @@ int main(int argc, char **argv)
std::cout << BIN_DIR << std::endl;
break;
case 'i':
std::cout << INCLUDE_DIR << std::endl;
case 'c':
std::cout << "-I" << INCLUDE_DIR << " ";
std::cout << "-I" << INCLUDE_DIR << "/qgis" << std::endl;
break;
case 'l':
std::cout << LIB_DIR << std::endl;
std::cout << "-L" << LIB_DIR << " ";
std::cout << " -lqgis" << std::endl;
break;
case 'w':
std::cout << PLUGIN_DIR << std::endl;
break;
case 'h':

3
tools/qgiscommit
View File

@ -10,7 +10,6 @@ if [ ! -f CVS/Repository -a ! `grep qgis CVS/Root` ]; then
exit -1
fi
#
# Get Changes
#
@ -43,7 +42,7 @@ fi
#
# find out where the top directory is
WAY2ROOT=`dirname $PWD | sed -e 's/\(.*\/qgis\).*/\1/'`
WAY2ROOT="`dirname $PWD | sed -e 's#\(.*\)\/qgis.*#\1#'`/qgis"
# if we're not already in the top directory, push the current directory on stack and
# cd to the top directory