nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed MOO_VERSION_WHATEVER to MOO_WHATEVER_VERSION

master
Yevgen Muntyan 2007-01-22 08:15:28 -06:00
parent b53e63c047
commit 5e5a2c8746
22 changed files with 79 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.h.win32
View File

@ -222,13 +222,13 @@
#define MOO_VERSION "0.6.999"
/* "libmoo major version" */
#define MOO_VERSION_MAJOR 0
#define MOO_MAJOR_VERSION 0
/* "libmoo micro version" */
#define MOO_VERSION_MICRO 999
#define MOO_MICRO_VERSION 2
/* "libmoo minor version" */
#define MOO_VERSION_MINOR 6
#define MOO_MINOR_VERSION 8
/* The value of NEWLINE determines the newline character */
#define NEWLINE '\n'

2
m4/moo-pygtk.m4
View File

@ -110,7 +110,7 @@ AC_DEFUN_ONCE([MOO_AC_PYTHON],[
MOO_AC_CHECK_PYTHON($_moo_python_version,[
_MOO_AC_CHECK_PYGTK([
MOO_USE_PYTHON=true
_MOO_SPLIT_VERSION(PYGTK, pygtk-2.0)
_MOO_SPLIT_VERSION_PKG(PYGTK, pygtk-2.0)
AC_SUBST(PYGTK_VERSION)
AC_SUBST(PYGTK_MAJOR_VERSION)
AC_SUBST(PYGTK_MINOR_VERSION)

43
m4/moo-version.m4
View File

@ -4,33 +4,30 @@
AC_DEFUN([MOO_DEFINE_VERSIONS],[
m4_toupper($1)_VERSION=\"$2.$3.$4\"
m4_toupper($1)_VERSION_UNQOTED=$2.$3.$4
m4_toupper($1)_VERSION_MAJOR=$2
m4_toupper($1)_VERSION_MINOR=$3
m4_toupper($1)_VERSION_MICRO=$4
m4_toupper($1)_MAJOR_VERSION=$2
m4_toupper($1)_MINOR_VERSION=$3
m4_toupper($1)_MICRO_VERSION=$4
AC_SUBST(m4_toupper($1)_VERSION)
AC_SUBST(m4_toupper($1)_VERSION_UNQUOTED)
AC_SUBST(m4_toupper($1)_VERSION_MAJOR)
AC_SUBST(m4_toupper($1)_VERSION_MINOR)
AC_SUBST(m4_toupper($1)_VERSION_MICRO)
AC_DEFINE(m4_toupper($1)_VERSION, ["$2.$3.$4"], "$1 version")
AC_DEFINE(m4_toupper($1)_VERSION_MAJOR, [$2], "$1 major version")
AC_DEFINE(m4_toupper($1)_VERSION_MINOR, [$3], "$1 minor version")
AC_DEFINE(m4_toupper($1)_VERSION_MICRO, [$4], "$1 micro version")
])
AC_SUBST(m4_toupper($1)_MAJOR_VERSION)
AC_SUBST(m4_toupper($1)_MINOR_VERSION)
AC_SUBST(m4_toupper($1)_MICRO_VERSION)
AC_DEFINE(m4_toupper($1)_VERSION, ["$2.$3.$4"], [$1 version])
AC_DEFINE(m4_toupper($1)_MAJOR_VERSION, [$2], [$1 major version])
AC_DEFINE(m4_toupper($1)_MINOR_VERSION, [$3], [$1 minor version])
AC_DEFINE(m4_toupper($1)_MICRO_VERSION, [$4], [$1 micro version])
]) # MOO_DEFINE_VERSIONS
##############################################################################
# MOO_DEFINE_MODULE_VERSIONS(major,minor)
#
AC_DEFUN([MOO_DEFINE_MODULE_VERSIONS],[
MOO_MODULE_VERSION=\"$1.$2\"
MOO_MODULE_VERSION_MAJOR=$1
MOO_MODULE_VERSION_MINOR=$2
AC_SUBST(MOO_MODULE_VERSION)
AC_SUBST(MOO_MODULE_VERSION_MAJOR)
AC_SUBST(MOO_MODULE_VERSION_MINOR)
AC_DEFINE(MOO_MODULE_VERSION_MAJOR, [$1], "libmoo module system major version")
AC_DEFINE(MOO_MODULE_VERSION_MINOR, [$2], "libmoo module system major version")
])
MOO_MODULE_VERSION=\"$1.$2\"
MOO_MODULE_MAJOR_VERSION=$1
MOO_MODULE_MINOR_VERSION=$2
AC_SUBST(MOO_MODULE_VERSION)
AC_SUBST(MOO_MODULE_MAJOR_VERSION)
AC_SUBST(MOO_MODULE_MINOR_VERSION)
AC_DEFINE(MOO_MODULE_MAJOR_VERSION, [$1], [libmoo module system major version])
AC_DEFINE(MOO_MODULE_MINOR_VERSION, [$2], [libmoo module system minor version])
]) # MOO_DEFINE_MODULE_VERSIONS

1
m4/python-cross-mingw.m4
View File

@ -1,5 +1,6 @@
dnl AM_PYTHON_DEVEL_CROSS_MINGW([action-if-found[,action-if-not-found[,version]]])
AC_DEFUN([AM_PYTHON_DEVEL_CROSS_MINGW],[
AC_REQUIRE([AC_PROG_SED])
m4_if([$3],[],[
m4_define([_ac_m4_pyver],[])
],[

4
medit/medit.rc.in
View File

@ -3,8 +3,8 @@
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "@top_srcdir@/@MOO_SRC_PREFIX@/mooutils/pixmaps/medit.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
PRODUCTVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
PRODUCTVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32

40
moo.kdevelop
View File

@ -26,7 +26,7 @@
</ignoreparts>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description></description>
<description/>
<secondaryLanguages>
<language>C</language>
</secondaryLanguages>
@ -57,15 +57,15 @@
<cxxcompiler>kdevgppoptions</cxxcompiler>
<f77compiler>kdevg77options</f77compiler>
<cflags>-O0 -g3</cflags>
<topsourcedir></topsourcedir>
<cppflags></cppflags>
<ccompilerbinary></ccompilerbinary>
<cxxcompilerbinary></cxxcompilerbinary>
<f77compilerbinary></f77compilerbinary>
<f77flags></f77flags>
<topsourcedir/>
<cppflags/>
<ccompilerbinary/>
<cxxcompilerbinary/>
<f77compilerbinary/>
<f77flags/>
<envvars/>
<ldflags></ldflags>
<cxxflags></cxxflags>
<ldflags/>
<cxxflags/>
</debug>
<gtk-print>
<configargs>--enable-debug --enable-all-gcc-warnings --without-python --prefix=/usr/local/gtk-print</configargs>
@ -234,7 +234,7 @@
<abortonerror>true</abortonerror>
<numberofjobs>3</numberofjobs>
<dontact>false</dontact>
<makebin></makebin>
<makebin/>
<prio>0</prio>
<runmultiplejobs>false</runmultiplejobs>
</make>
@ -246,10 +246,10 @@
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>true</floatingtoolbar>
<gdbpath></gdbpath>
<configGdbScript></configGdbScript>
<runShellScript></runShellScript>
<runGdbScript></runGdbScript>
<gdbpath/>
<configGdbScript/>
<runShellScript/>
<runGdbScript/>
</general>
<display>
<staticmembers>true</staticmembers>
@ -311,16 +311,16 @@
</kdevdoctreeview>
<kdevfilecreate>
<filetypes>
<type icon="source" ext="g" name="GAP source" create="template" >
<type icon="source" ext="g" create="template" name="GAP source" >
<descr>A new empty GAP source file</descr>
</type>
<type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
<type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
<descr>A new empty C++ file.</descr>
</type>
<type icon="source_h" ext="h" name="C/C++ Header" create="template" >
<type icon="source_h" ext="h" create="template" name="C/C++ Header" >
<descr>A new empty header file for C/C++.</descr>
</type>
<type icon="source_c" ext="c" name="C Source" create="template" >
<type icon="source_c" ext="c" create="template" name="C Source" >
<descr>A new empty C file.</descr>
</type>
</filetypes>
@ -347,7 +347,7 @@
</codecompletion>
<references/>
<creategettersetter>
<prefixGet></prefixGet>
<prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
@ -357,7 +357,7 @@
<qt>
<used>false</used>
<version>3</version>
<root></root>
<root/>
</qt>
</kdevcppsupport>
<kdevdocumentation>

4
moo.mprj
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<medit-project version="1.0" type="C" name="moo">
<active>optimized</active>
<active>debug</active>
<commands>
<compile>cd $(builddir) &amp;&amp; $(make) $(base).lo</compile>
</commands>
@ -36,7 +36,7 @@
</configure>
</optimized>
</configurations>
<file_selector_dir>/home/muntyan/projects/moo/</file_selector_dir>
<file_selector_dir>/home/muntyan/projects/moo/moo/mooapp/smclient/</file_selector_dir>
<run>
<args>--g-fatal-warnings --new-app --mode=project</args>
<exe>medit/medit</exe>

4
moo/libmoo.rc.in
View File

@ -2,8 +2,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
PRODUCTVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
PRODUCTVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32

10
moo/moo-config.h.in
View File

@ -16,13 +16,13 @@
#define MOO_VERSION @MOO_VERSION@
#define MOO_VERSION_MAJOR @MOO_VERSION_MAJOR@
#define MOO_VERSION_MINOR @MOO_VERSION_MINOR@
#define MOO_VERSION_MICRO @MOO_VERSION_MICRO@
#define MOO_MAJOR_VERSION @MOO_MAJOR_VERSION@
#define MOO_MINOR_VERSION @MOO_MINOR_VERSION@
#define MOO_MICRO_VERSION @MOO_MICRO_VERSION@
#define MOO_MODULE_VERSION @MOO_MODULE_VERSION@
#define MOO_MODULE_VERSION_MAJOR @MOO_MODULE_VERSION_MAJOR@
#define MOO_MODULE_VERSION_MINOR @MOO_MODULE_VERSION_MINOR@
#define MOO_MODULE_MAJOR_VERSION @MOO_MODULE_MAJOR_VERSION@
#define MOO_MODULE_MINOR_VERSION @MOO_MODULE_MINOR_VERSION@
@MOO_APP_ENABLED_DEFINE@
@MOO_EDIT_ENABLED_DEFINE@

4
moo/moo24.rc.in
View File

@ -2,8 +2,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
PRODUCTVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
PRODUCTVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32

4
moo/moo25.rc.in
View File

@ -2,8 +2,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
PRODUCTVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
PRODUCTVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32

8
moo/mooedit/mooplugin.c
View File

@ -814,17 +814,17 @@ _moo_module_version (guint *major,
guint *minor)
{
if (major)
*major = MOO_MODULE_VERSION_MAJOR;
*major = MOO_MODULE_MAJOR_VERSION;
if (minor)
*minor = MOO_MODULE_VERSION_MINOR;
*minor = MOO_MODULE_MINOR_VERSION;
}
gboolean
moo_module_check_version (guint major,
guint minor)
{
return major == MOO_MODULE_VERSION_MAJOR &&
minor <= MOO_MODULE_VERSION_MINOR;
return major == MOO_MODULE_MAJOR_VERSION &&
minor <= MOO_MODULE_MINOR_VERSION;
}

2
moo/moopython/plugins/pyproject/project-plugin.ini.desktop.in.in
View File

@ -1,7 +1,7 @@
[module]
type=Python
file=project/project-plugin.py
version=@MOO_MODULE_VERSION_MAJOR@.@MOO_MODULE_VERSION_MINOR@
version=@MOO_MODULE_MAJOR_VERSION@.@MOO_MODULE_MINOR_VERSION@
[plugin]
id=ProjectManager

2
moo/moopython/plugins/python.ini.desktop.in.in
View File

@ -1,7 +1,7 @@
[module]
type=Python
file=python.py
version=@MOO_MODULE_VERSION_MAJOR@.@MOO_MODULE_VERSION_MINOR@
version=@MOO_MODULE_MAJOR_VERSION@.@MOO_MODULE_MINOR_VERSION@
[plugin]
id=Python

2
moo/moopython/plugins/terminal.ini.desktop.in.in
View File

@ -1,7 +1,7 @@
[module]
type=Python
file=terminal.py
version=@MOO_MODULE_VERSION_MAJOR@.@MOO_MODULE_VERSION_MINOR@
version=@MOO_MODULE_MAJOR_VERSION@.@MOO_MODULE_MINOR_VERSION@
[plugin]
id=Terminal

6
moo/moopython/pygtk/moo-pygtk.c
View File

@ -39,9 +39,9 @@ moo_detailed_version (void)
g_return_val_if_fail (res != NULL, NULL);
PyDict_SetItemString (res, "full", PyString_FromString (MOO_VERSION));
PyDict_SetItemString (res, "major", PyInt_FromLong (MOO_VERSION_MAJOR));
PyDict_SetItemString (res, "minor", PyInt_FromLong (MOO_VERSION_MINOR));
PyDict_SetItemString (res, "micro", PyInt_FromLong (MOO_VERSION_MICRO));
PyDict_SetItemString (res, "major", PyInt_FromLong (MOO_MAJOR_VERSION));
PyDict_SetItemString (res, "minor", PyInt_FromLong (MOO_MINOR_VERSION));
PyDict_SetItemString (res, "micro", PyInt_FromLong (MOO_MICRO_VERSION));
return res;
}

2
moo/moopython/pymoo.ini.in
View File

@ -1,4 +1,4 @@
[module]
type=C
file=pymoo
version=@MOO_MODULE_VERSION_MAJOR@.@MOO_MODULE_VERSION_MINOR@
version=@MOO_MODULE_MAJOR_VERSION@.@MOO_MODULE_MINOR_VERSION@

2
moo/moopython/pymoo24.ini.in
View File

@ -1,4 +1,4 @@
[module]
type=C
file=pymoo24/pymoo
version=@MOO_MODULE_VERSION_MAJOR@.@MOO_MODULE_VERSION_MINOR@
version=@MOO_MODULE_MAJOR_VERSION@.@MOO_MODULE_MINOR_VERSION@

2
moo/moopython/pymoo25.ini.in
View File

@ -1,4 +1,4 @@
[module]
type=C
file=pymoo25/pymoo
version=@MOO_MODULE_VERSION_MAJOR@.@MOO_MODULE_VERSION_MINOR@
version=@MOO_MODULE_MAJOR_VERSION@.@MOO_MODULE_MINOR_VERSION@

4
moo/mooterm/termhelper_res.rc.in
View File

@ -1,8 +1,8 @@
#include <windows.h>
1 VERSIONINFO
FILEVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
PRODUCTVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
PRODUCTVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
FILETYPE VFT_APP
{
BLOCK "StringFileInfo"

4
moo/pymoo24.rc.in
View File

@ -2,8 +2,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
PRODUCTVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
PRODUCTVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32

4
moo/pymoo25.rc.in
View File

@ -2,8 +2,8 @@
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
PRODUCTVERSION @MOO_VERSION_MAJOR@,@MOO_VERSION_MINOR@,@MOO_VERSION_MICRO@,0
FILEVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
PRODUCTVERSION @MOO_MAJOR_VERSION@,@MOO_MINOR_VERSION@,@MOO_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32