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

Moved medit stuff into separate folder medit/

master
Yevgen Muntyan 2006-12-12 20:51:11 -06:00
parent e2e3a9e7f8
commit e35969082a
13 changed files with 94 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.hgignore
View File

@ -39,8 +39,8 @@ moo/mooutils/stock-moo.h$
devcpp/Makefile\.win$
devcpp/medit\.layout$
.*\.Po$
^wininstaller/medit\.iss$
^tests/medit\.rc$
^medit/medit\.iss$
^medit/medit\.rc$
^tests/pyapp\.py$
^stamp-h1$
^medit$

36
Makefile.am
View File

@ -30,10 +30,9 @@ EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
mkpotsubdirs \
medit.desktop.in
mkpotsubdirs
all-am: pot-subdirs-stamp wininstaller/medit.iss m4-stamp
all-am: pot-subdirs-stamp m4-stamp
m4-stamp: $(m4files)
echo stamp > m4-stamp
@ -47,38 +46,19 @@ pot-subdirs-stamp: po/POTFILES.in
$(SHELL) $(srcdir)/mkpotsubdirs "$(srcdir)"
CLEANFILES = pot-subdirs-stamp
DIST_SUBDIRS = moo tests po
DIST_SUBDIRS = moo medit tests po
# need to create pot-subdirs-stamp before it goes to po/
SUBDIRS = . moo tests po
SUBDIRS = . moo medit po
if MOO_ENABLE_TESTS
SUBDIRS += tests
endif
ACLOCAL_AMFLAGS = -I m4
@INTLTOOL_DESKTOP_RULE@
DESKTOP_IN_FILES = medit.desktop.in
DESKTOP_FILES =$(DESKTOP_IN_FILES:.desktop.in=.desktop)
desktopdir = $(datadir)/applications
desktop_DATA = $(DESKTOP_FILES)
DISTCLEANFILES = \
m4-stamp \
configargs.h \
$(DESKTOP_FILES) \
intltool-extract \
intltool-merge \
intltool-update
appicondir = $(datadir)/pixmaps
appicon_DATA = moo/mooutils/pixmaps/medit.png
hicolor = $(datadir)/icons/hicolor
iconthemedir = $(hicolor)/48x48/apps
icontheme_DATA = moo/mooutils/pixmaps/medit.png
# update_icon_cache = gtk-update-icon-cache -f -t $(hicolor)
#
# install-data-hook:
# if echo "Updating icon cache" && $(update_icon_cache); then \
# echo "Done."; \
# else \
# echo "*** GTK icon cache not updated. After install, run this:";\
# echo $(update_icon_cache); \
# fi

4
configure.ac
View File

@ -57,10 +57,10 @@ moo/mooutils/pcre/Makefile
moo/mooutils/xdgmime/Makefile
moo/mooterm/termhelper_res.rc
tests/pyapp.py
tests/medit.rc
tests/Makefile
medit/Makefile
medit/medit.iss
po/Makefile.in
wininstaller/medit.iss
])
AC_OUTPUT

6
makewin
View File

@ -57,7 +57,7 @@ if release:
installdir = dir + "/inst_"
issdir = "Z:%s/wininstaller" % (moo_builddir,)
issdir = "Z:%s/medit" % (moo_builddir,)
iss = issdir + "/medit.iss"
@ -148,11 +148,11 @@ def build():
else:
installer = name or ("medit-" + dbg + get_version() + ".exe")
do_cmd("wine /usr/local/win/InnoSetup5/ISCC.exe " + iss)
do_cmd("mv %s/wininstaller/Output/setup.exe %s/%s" % (moo_builddir, dir, installer))
do_cmd("mv %s/medit/Output/setup.exe %s/%s" % (moo_builddir, dir, installer))
def clean():
do_cmd("rm -rf %s %s %s" % (moo_windir, installdir,
moo_builddir + "/wininstaller/Output"))
moo_builddir + "/medit/Output"))
try:
build()

71
medit/Makefile.am Normal file
View File

@ -0,0 +1,71 @@
AM_CFLAGS = \
-I$(top_builddir) \
-I../moo \
$(MOO_CFLAGS) \
$(MOO_DEBUG_CFLAGS)
EXTRA_DIST = \
medit-ui.xml \
medit-app.opag \
medit.rc.in
all-am: medit.iss
bin_PROGRAMS = medit
medit_SOURCES = medit-ui.h medit-credits.h medit-app.c
BUILT_SOURCES = medit-ui.h medit-credits.h medit-app.c
nodist_medit_SOURCES =
medit_LDFLAGS = -export-dynamic $(PYTHON_EXTRA_LDFLAGS) $(medit_res_ldflag)
medit_LDADD = ../moo/libmoo.la
if MOO_OS_MINGW
medit_LDFLAGS += -mwindows
CLEANFILES = medit.res medit.rc
medit_res_ldflag = -Wl,medit.res
BUILT_SOURCES += medit.res
nodist_medit_SOURCES += medit.res
@MOO_WIN32_RC_IN_RULE@
@MOO_WIN32_RC_RULE@
endif
XML2H = $(srcdir)/../moo/mooutils/xml2h.sh
medit-ui.h: medit-ui.xml $(XML2H)
$(SHELL) $(XML2H) MEDIT_UI $(srcdir)/medit-ui.xml > medit-ui.h.tmp && \
mv medit-ui.h.tmp medit-ui.h
medit-credits.h: ../THANKS $(XML2H)
$(SHELL) $(XML2H) THANKS $(srcdir)/../THANKS > medit-credits.h
medit-app.c: medit-app.opag medit-ui.h
if test -z $(OPAG); then \
touch $(srcdir)/medit-app.c; \
else \
$(OPAG) -f _medit_parse_options -O _medit_opt_ -A _medit_arg_ $(srcdir)/medit-app.opag $(srcdir)/medit-app.c; \
fi
EXTRA_DIST += medit.desktop.in
@INTLTOOL_DESKTOP_RULE@
DESKTOP_IN_FILES = medit.desktop.in
DESKTOP_FILES =$(DESKTOP_IN_FILES:.desktop.in=.desktop)
desktopdir = $(datadir)/applications
desktop_DATA = $(DESKTOP_FILES)
DISTCLEANFILES = $(DESKTOP_FILES)
appicondir = $(datadir)/pixmaps
appicon_DATA = ../moo/mooutils/pixmaps/medit.png
hicolor = $(datadir)/icons/hicolor
iconthemedir = $(hicolor)/48x48/apps
icontheme_DATA = ../moo/mooutils/pixmaps/medit.png
# update_icon_cache = gtk-update-icon-cache -f -t $(hicolor)
#
# install-data-hook:
# if echo "Updating icon cache" && $(update_icon_cache); then \
# echo "Done."; \
# else \
# echo "*** GTK icon cache not updated. After install, run this:";\
# echo $(update_icon_cache); \
# fi

0
tests/medit-app.c → medit/medit-app.c
View File

4
tests/medit-app.opag → medit/medit-app.opag
View File

@ -19,6 +19,8 @@
#include <string.h>
#include <stdio.h>
#define APPNAME "medit"
#if GTK_CHECK_VERSION(2,8,0) && defined(GDK_WINDOWING_X11)
#include <gdk/gdkx.h>
#define TIMESTAMP (gdk_x11_display_get_user_time (gdk_display_get_default ()))
@ -263,6 +265,8 @@ main (int argc, char *argv[])
init_mem_stuff ();
g_set_prgname ("medit");
gtk_init (&argc, &argv);
stamp = TIMESTAMP;

0
tests/medit-ui.xml → medit/medit-ui.xml
View File

0
medit.desktop.in → medit/medit.desktop.in
View File

0
wininstaller/medit.iss.in → medit/medit.iss.in
View File

0
tests/medit.rc.in → medit/medit.rc.in
View File

4
po/POTFILES.in
View File

@ -1,5 +1,5 @@
medit.desktop.in
tests/medit-ui.xml
medit/medit.desktop.in
medit/medit-ui.xml
moo/mooapp/mooappabout.c
moo/mooapp/mooapp.c

58
tests/Makefile.am
View File

@ -25,7 +25,7 @@ if MOO_BUILD_APP
test_programs += testhtml
endif
EXTRA_PROGRAMS = medit $(test_programs)
EXTRA_PROGRAMS = $(test_programs)
if MOO_ENABLE_TESTS
noinst_PROGRAMS += $(test_programs)
@ -34,36 +34,10 @@ endif
all-tests: $(EXTRA_PROGRAMS)
EXTRA_DIST = \
pyapp.py.in \
medit-ui.xml \
medit-app.opag
BUILT_SOURCES = medit-ui.h medit-credits.h
XML2H = $(srcdir)/../moo/mooutils/xml2h.sh
medit-ui.h: medit-ui.xml $(XML2H)
$(SHELL) $(XML2H) MEDIT_UI $(srcdir)/medit-ui.xml > medit-ui.h.tmp && \
mv medit-ui.h.tmp medit-ui.h
medit-credits.h: ../THANKS $(XML2H)
$(SHELL) $(XML2H) THANKS $(srcdir)/../THANKS > medit-credits.h
# medit-app.c is not in BUILT_SOURCES, so the target must use absolute path to it
$(srcdir)/medit-app.c: medit-app.opag medit-ui.h
if test -z $(OPAG); then \
touch $(srcdir)/medit-app.c; \
else \
$(OPAG) -f _medit_parse_options -O _medit_opt_ -A _medit_arg_ $(srcdir)/medit-app.opag $(srcdir)/medit-app.c; \
fi
pyapp.py.in
all-am: pyapp.py
if MOO_BUILD_APP
medit = medit
endif
if MOO_BUILD_EDIT
medit = medit
# noinst_PROGRAMS += testtext
endif
if MOO_BUILD_TERM
if !MOO_OS_CYGWIN
if !MOO_BUILD_APP
@ -82,8 +56,6 @@ endif
endif
endif
bin_PROGRAMS = $(medit)
ldflags = -export-dynamic $(PYTHON_EXTRA_LDFLAGS)
ldadd = ../moo/libmoo.la
@ -92,32 +64,6 @@ ldflags += -mwindows
endif MOO_OS_MINGW
##############################################################################
## medit
##
nodist_medit_SOURCES =
if MOO_OS_MINGW
CLEANFILES = medit.res medit.rc
medit_res_ldflag = -Wl,medit.res
BUILT_SOURCES += medit.res
nodist_medit_SOURCES += medit.res
@MOO_WIN32_RC_IN_RULE@
@MOO_WIN32_RC_RULE@
endif
medit_LDFLAGS = $(ldflags) $(medit_res_ldflag)
medit_LDADD = $(ldadd)
medit_SOURCES = medit-ui.h medit-credits.h
EXTRA_DIST += medit.rc.in medit-app.c
if MOO_BUILD_APP
medit_SOURCES += medit-app.c
else
medit_SOURCES += medit.c
endif
testfold_LDFLAGS = $(ldflags)
testfold_LDADD = $(ldadd)
testfold_SOURCES = testfold.c