From 5e270cde10608657fc03c9ef89b395fac4365764 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Fri, 21 Jun 2002 22:46:34 +0000 Subject: [PATCH] - first version that compiles svn path=/trunk/core/; revision=2809 --- MAINTAINER | 1 + Makefile.cvs | 18 +++++ RPMNAME | 1 + SUBDIRS | 1 + VERSION | 1 + agent-any/src/Makefile.am | 15 +++- agent-any/testsuite/Makefile.am | 7 +- agent-dummy/Makefile.am | 4 +- agent-dummy/src/Makefile.am | 7 +- agent-dummy/testsuite/Makefile.am | 7 +- agent-dumpto/Makefile.am | 4 +- agent-dumpto/src/Makefile.am | 7 +- agent-dumpto/testsuite/Makefile.am | 7 +- agent-ini/src/Makefile.am | 10 ++- agent-ini/testsuite/Makefile.am | 13 +++- agent-losetup/Makefile.am | 4 +- agent-losetup/src/Makefile.am | 35 ++------- agent-modules/src/Makefile.am | 10 ++- agent-modules/testsuite/Makefile.am | 10 ++- agent-probe/src/Makefile.am | 9 ++- agent-probe/testsuite/Makefile.am | 11 ++- agent-resolver/Makefile.am | 4 +- agent-resolver/src/Makefile.am | 7 +- agent-resolver/testsuite/Makefile.am | 10 ++- agent-system/src/Makefile.am | 9 ++- agent-system/testsuite/Makefile.am | 10 ++- base/src/Makefile.am | 11 ++- configure.in.in | 37 ++++++++++ libpkg/src/Makefile.am | 9 ++- libpkg/testsuite/Makefile.am | 12 ++- libscr/src/Makefile.am | 9 ++- libscr/testsuite/Makefile.am | 10 ++- liby2/src/Makefile.am | 10 ++- liby2/testsuite/Makefile.am | 20 ++--- libycp/src/Makefile.am | 2 +- libycp/src/include/ycp/y2log.h | 1 + libycp/testsuite/Makefile.am | 1 + libyui/doc/YCP-UI-richtext.html | 106 +++++++++++++++++++++++++++ libyui/src/Makefile.am | 8 +- libyui/testsuite/Makefile.am | 9 ++- scr/doc/SCR-additional.html | 55 ++++++++++++++ scr/src/Makefile.am | 12 ++- scr/testsuite/Makefile.am | 21 ++++-- wfm/src/Makefile.am | 11 ++- wfm/testsuite/Makefile.am | 20 +++-- 45 files changed, 455 insertions(+), 131 deletions(-) create mode 100644 MAINTAINER create mode 100644 Makefile.cvs create mode 100644 RPMNAME create mode 100644 SUBDIRS create mode 100644 VERSION create mode 100644 configure.in.in create mode 100644 libyui/doc/YCP-UI-richtext.html create mode 100644 scr/doc/SCR-additional.html diff --git a/MAINTAINER b/MAINTAINER new file mode 100644 index 000000000..9d4589d71 --- /dev/null +++ b/MAINTAINER @@ -0,0 +1 @@ +Arvin Schnell diff --git a/Makefile.cvs b/Makefile.cvs new file mode 100644 index 000000000..8e1b37392 --- /dev/null +++ b/Makefile.cvs @@ -0,0 +1,18 @@ +# +# Makefile.cvs for yast2-core +# +configure: all + ./configure + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status diff --git a/RPMNAME b/RPMNAME new file mode 100644 index 000000000..64bc1ae14 --- /dev/null +++ b/RPMNAME @@ -0,0 +1 @@ +yast2-core diff --git a/SUBDIRS b/SUBDIRS new file mode 100644 index 000000000..6999acf23 --- /dev/null +++ b/SUBDIRS @@ -0,0 +1 @@ +libycp liby2 libyui libscr libpkg agent-any agent-dummy agent-dumpto agent-ini agent-losetup agent-modules agent-probe agent-resolver agent-system agents-non-y2 agents-perl scr wfm base diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..e70b4523a --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +2.6.0 diff --git a/agent-any/src/Makefile.am b/agent-any/src/Makefile.am index 9470d417f..d69244ab9 100644 --- a/agent-any/src/Makefile.am +++ b/agent-any/src/Makefile.am @@ -1,7 +1,9 @@ # -# Makefile.am for y2a_any/src +# Makefile.am for core/agent-any/src # +AM_CXXFLAGS = -DY2LOG=\"agent-any\" + plugin_LTLIBRARIES = libpy2ag_anyagent.la noinst_LTLIBRARIES = liby2ag_anyagent.la @@ -15,7 +17,14 @@ liby2ag_anyagent_la_LIBADD = -lycp -ly2 -lscr libpy2ag_anyagent_la_SOURCES = \ $(liby2ag_anyagent_la_SOURCES) \ Y2CCAnyAgent.cc -libpy2ag_anyagent_la_LDFLAGS = -version-info 2:0 +libpy2ag_anyagent_la_LDFLAGS = -version-info 2:0 \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src + libpy2ag_anyagent_la_LIBADD = -lycp -ly2 -lscr -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/agent-any/testsuite/Makefile.am b/agent-any/testsuite/Makefile.am index 6e79c1f81..9bf894a71 100644 --- a/agent-any/testsuite/Makefile.am +++ b/agent-any/testsuite/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2a_anyagent/testsuite +# Makefile.am for core/agent-any/testsuite # SUBDIRS = config lib ag_anyagent.test tests @@ -7,7 +7,10 @@ SUBDIRS = config lib ag_anyagent.test tests PACKAGE = ag_anyagent AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include noinst_PROGRAMS = runag_anyagent diff --git a/agent-dummy/Makefile.am b/agent-dummy/Makefile.am index 35f16da78..9ff14f977 100644 --- a/agent-dummy/Makefile.am +++ b/agent-dummy/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2scr/ag_dummy +# # -SUBDIRS = src conf doc testsuite +SUBDIRS = conf doc src testsuite diff --git a/agent-dummy/src/Makefile.am b/agent-dummy/src/Makefile.am index 9ef1164cb..1ee72c9e3 100644 --- a/agent-dummy/src/Makefile.am +++ b/agent-dummy/src/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2scr/ag_dummy/src +# Makefile.am for core/agent-dummy/src # plugin_LTLIBRARIES = libpy2ag_dummy.la @@ -10,4 +10,7 @@ libpy2ag_dummy_la_SOURCES = \ libpy2ag_dummy_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/agent-dummy/testsuite/Makefile.am b/agent-dummy/testsuite/Makefile.am index 49b182553..745c893f6 100644 --- a/agent-dummy/testsuite/Makefile.am +++ b/agent-dummy/testsuite/Makefile.am @@ -1,16 +1,19 @@ # -# Makefile.am for y2scr/ag_dummy/testsuite +# Makefile.am for core/agent-dummy/testsuite # AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I$(includedir) +INCLUDES = noinst_PROGRAMS = y2ag_dummy y2ag_dummy_SOURCES = y2ag_dummy.cc y2ag_dummy_LDADD = -lscr -ly2 -lycp y2ag_dummy_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ $(plugindir)/libpy2script.la \ diff --git a/agent-dumpto/Makefile.am b/agent-dumpto/Makefile.am index 0d771fdbf..9ff14f977 100644 --- a/agent-dumpto/Makefile.am +++ b/agent-dumpto/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2scr/ag_dumpto +# # -SUBDIRS = src doc testsuite conf +SUBDIRS = conf doc src testsuite diff --git a/agent-dumpto/src/Makefile.am b/agent-dumpto/src/Makefile.am index 017bd13bd..1dc874b8d 100644 --- a/agent-dumpto/src/Makefile.am +++ b/agent-dumpto/src/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2scr/ag_dumpto/src +# Makefile.am for core/agent-dumpto/src # plugin_LTLIBRARIES = libpy2ag_dumpto.la @@ -10,4 +10,7 @@ libpy2ag_dumpto_la_SOURCES = \ libpy2ag_dumpto_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/agent-dumpto/testsuite/Makefile.am b/agent-dumpto/testsuite/Makefile.am index f5bc93b83..6fe8194f7 100644 --- a/agent-dumpto/testsuite/Makefile.am +++ b/agent-dumpto/testsuite/Makefile.am @@ -1,16 +1,19 @@ # -# Makefile.am for y2scr/ag_dumpto/testsuite +# Makefile.am for core/agent-dumpto/testsuite # AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I$(includedir) +INCLUDES = noinst_PROGRAMS = y2ag_dumpto y2ag_dumpto_SOURCES = y2ag_dumpto.cc y2ag_dumpto_LDADD = -lscr -ly2 -lycp y2ag_dumpto_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ $(plugindir)/libpy2script.la \ diff --git a/agent-ini/src/Makefile.am b/agent-ini/src/Makefile.am index b6c6e0057..1b92c3026 100644 --- a/agent-ini/src/Makefile.am +++ b/agent-ini/src/Makefile.am @@ -1,8 +1,8 @@ # -# Makefile.am for y2a_ini/src +# Makefile.am for core/agent-ini/src # -AM_CXXFLAGS = -Wall # -g # -pedantic # -W +AM_CXXFLAGS = -DY2LOG=\"agent-ini\" plugin_LTLIBRARIES = libpy2ag_ini.la noinst_LTLIBRARIES = liby2ag_ini.la @@ -23,5 +23,7 @@ libpy2ag_ini_la_SOURCES = \ Y2IniAgentComponent.cc Y2IniAgentComponent.h libpy2ag_ini_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(includedir) - +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/agent-ini/testsuite/Makefile.am b/agent-ini/testsuite/Makefile.am index 4b81f27cd..3bfa15e44 100644 --- a/agent-ini/testsuite/Makefile.am +++ b/agent-ini/testsuite/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2a_ini/testsuite +# Makefile.am for core/agent-ini/testsuite # SUBDIRS = config lib ag_ini.test tests ag_ini.debug debug ag_ini.multi multi @@ -7,16 +7,21 @@ SUBDIRS = config lib ag_ini.test tests ag_ini.debug debug ag_ini.multi multi PACKAGE = ag_ini AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include noinst_PROGRAMS = runag_ini runag_ini_SOURCES = runag_ini.cc runag_ini_LDADD = -lscr -ly2 -lycp -lcrypt -runag_ini_LDFLAGS = -L$(libdir) \ +runag_ini_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ $(plugindir)/libpy2script.la \ ../src/libpy2ag_ini.la \ -Xlinker --no-whole-archive - diff --git a/agent-losetup/Makefile.am b/agent-losetup/Makefile.am index 6098745c1..9b37f3062 100644 --- a/agent-losetup/Makefile.am +++ b/agent-losetup/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2scr/ag_shell +# # -SUBDIRS = src doc conf +SUBDIRS = conf src doc diff --git a/agent-losetup/src/Makefile.am b/agent-losetup/src/Makefile.am index 1196a061d..fd9e91438 100644 --- a/agent-losetup/src/Makefile.am +++ b/agent-losetup/src/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2scr/y2losetup/src +# Makefile.am for core/agent-losetup/src # plugin_LTLIBRARIES = libpy2ag_losetup.la @@ -10,32 +10,7 @@ libpy2ag_losetup_la_SOURCES = \ libpy2ag_losetup_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(top_srcdir) -I$(includedir) - -################################## -# -# bin_PROGRAMS = y2losetup -# y2losetup_SOURCES = \ -# y2losetup.c \ -# y2loop.h \ -# loop.h \ -# y2lomount.h \ -# rmd160.h \ -# rmd160.c -# -# serversdir = $(YAST2DIR)/servers -# -# servers_PROGRAMS = ag_losetup -# -# ag_losetup_SOURCES = \ -# LosetupAgent.cc LosetupAgent.h LosetupIO.c LosetupIO.h rmd160.h \ -# rmd160.c y2loop.h loop.h y2lomount.h -# -# INCLUDES = -I$(includedir) -# -# ag_losetup_LDADD = -L$(libdir) -lscr -ly2 -lycp -lcrypt -# -# noinst_LTLIBRARIES = libag_losetup.la -# libag_losetup_la_SOURCES = $(ag_losetup_SOURCES) -# - +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/agent-modules/src/Makefile.am b/agent-modules/src/Makefile.am index 75668d310..6c5862e18 100644 --- a/agent-modules/src/Makefile.am +++ b/agent-modules/src/Makefile.am @@ -1,8 +1,8 @@ # -# Makefile.am for y2a_mods/src +# Makefile.am for core/agent-modules/src # -AM_CXXFLAGS = -Wall #-g # -pedantic # -W +AM_CXXFLAGS = -DY2LOG=\"agent-modules\" plugin_LTLIBRARIES = libpy2ag_modules.la noinst_LTLIBRARIES = liby2ag_modules.la @@ -19,5 +19,7 @@ libpy2ag_modules_la_SOURCES = \ Y2ModulesAgentComponent.cc Y2ModulesAgentComponent.h libpy2ag_modules_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(includedir) - +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/agent-modules/testsuite/Makefile.am b/agent-modules/testsuite/Makefile.am index 442f7c8d6..c40f1e7bb 100644 --- a/agent-modules/testsuite/Makefile.am +++ b/agent-modules/testsuite/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2a_mods/testsuite +# Makefile.am for core/agent-modules/testsuite # SUBDIRS = config lib ag_modules.test tests @@ -7,13 +7,19 @@ SUBDIRS = config lib ag_modules.test tests PACKAGE = ag_modules AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include noinst_PROGRAMS = runmodules runmodules_SOURCES = runmodules.cc runmodules_LDADD = -lscr -ly2 -lycp -lcrypt runmodules_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ $(plugindir)/libpy2script.la \ diff --git a/agent-probe/src/Makefile.am b/agent-probe/src/Makefile.am index 6742d61b3..bc954bf0f 100644 --- a/agent-probe/src/Makefile.am +++ b/agent-probe/src/Makefile.am @@ -1,7 +1,9 @@ # -# Makefile.am for y2a_hwpb/src +# Makefile.am for core/agent-probe/src # +AM_CXXFLAGS = -DY2LOG=\"agent-probe\" + plugin_LTLIBRARIES = libpy2ag_hwprobe.la noinst_LTLIBRARIES = liby2ag_hwprobe.la @@ -18,4 +20,7 @@ libpy2ag_hwprobe_la_SOURCES = \ libpy2ag_hwprobe_la_LDFLAGS = -version-info 2:0 libpy2ag_hwprobe_la_LIBADD = -lhd -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/agent-probe/testsuite/Makefile.am b/agent-probe/testsuite/Makefile.am index 59b247e7d..bf842de04 100644 --- a/agent-probe/testsuite/Makefile.am +++ b/agent-probe/testsuite/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2a_hwpb/testsuite +# Makefile.am for core/agent-probe/testsuite # SUBDIRS = config lib ag_hwprobe.test tests @@ -7,15 +7,20 @@ SUBDIRS = config lib ag_hwprobe.test tests PACKAGE = ag_hwprobe AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include noinst_PROGRAMS = runag_hwprobe runag_hwprobe_SOURCES = runag_hwprobe.cc runag_hwprobe_LDADD = -ly2 -lycp -lscr -lcrypt -lutil runag_hwprobe_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ ../src/libpy2ag_hwprobe.la \ -Xlinker --no-whole-archive - diff --git a/agent-resolver/Makefile.am b/agent-resolver/Makefile.am index 7578b6676..9ff14f977 100644 --- a/agent-resolver/Makefile.am +++ b/agent-resolver/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2scr/ag_resolv +# # -SUBDIRS = src doc testsuite conf +SUBDIRS = conf doc src testsuite diff --git a/agent-resolver/src/Makefile.am b/agent-resolver/src/Makefile.am index 41ff2ff50..3916fab26 100644 --- a/agent-resolver/src/Makefile.am +++ b/agent-resolver/src/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2scr/ag_resolver/src +# Makefile.am for core/agent-resolver/src # plugin_LTLIBRARIES = libpy2ag_resolver.la @@ -9,4 +9,7 @@ libpy2ag_resolver_la_SOURCES = \ libpy2ag_resolver_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(top_srcdir) -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/agent-resolver/testsuite/Makefile.am b/agent-resolver/testsuite/Makefile.am index ef58335b6..c6425fc3d 100644 --- a/agent-resolver/testsuite/Makefile.am +++ b/agent-resolver/testsuite/Makefile.am @@ -1,16 +1,22 @@ # -# Makefile.am for y2scr/ag_resolver/testsuite +# Makefile.am for core/agent-resolver/testsuite # AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include noinst_PROGRAMS = y2ag_resolver y2ag_resolver_SOURCES = y2ag_resolver.cc y2ag_resolver_LDADD = -lscr -ly2 -lycp y2ag_resolver_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ $(plugindir)/libpy2script.la \ diff --git a/agent-system/src/Makefile.am b/agent-system/src/Makefile.am index 8a1723c34..8ffcd339c 100644 --- a/agent-system/src/Makefile.am +++ b/agent-system/src/Makefile.am @@ -1,7 +1,9 @@ # -# Makefile.am for y2a_system/src +# Makefile.am for core/agent-system/src # +AM_CXXFLAGS = -DY2LOG=\"agent-system\" + plugin_LTLIBRARIES = libpy2ag_system.la libpy2ag_system_la_SOURCES = \ @@ -11,4 +13,7 @@ libpy2ag_system_la_SOURCES = \ libpy2ag_system_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(top_srcdir) -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/agent-system/testsuite/Makefile.am b/agent-system/testsuite/Makefile.am index 0a9556e3e..645c86e8a 100644 --- a/agent-system/testsuite/Makefile.am +++ b/agent-system/testsuite/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2a_system/testsuite +# Makefile.am for core/agent-system/testsuite # SUBDIRS = config lib ag_system.test tests @@ -7,13 +7,19 @@ SUBDIRS = config lib ag_system.test tests PACKAGE = ag_system AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include noinst_PROGRAMS = runag_system runag_system_SOURCES = runag_system.cc runag_system_LDADD = -ly2 -lycp -lscr -lcrypt -lutil runag_system_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ ../src/libpy2ag_system.la \ diff --git a/base/src/Makefile.am b/base/src/Makefile.am index cdd000de0..9d37eafb0 100644 --- a/base/src/Makefile.am +++ b/base/src/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for yast2-base/src +# Makefile.am for core/base/src # ybin_PROGRAMS = y2base @@ -13,10 +13,10 @@ YAST2CORE = \ $(plugindir)/libpy2program.la \ $(plugindir)/libpy2wfm.la \ $(plugindir)/libpy2scr.la \ - $(libdir)/libscr.la \ - $(libdir)/liby2.la \ - $(libdir)/libyui.la \ - $(libdir)/libycp.la + $(srcdir)/../../libycp/src/libycp.la \ + $(srcdir)/../../liby2/src/liby2.la \ + $(srcdir)/../../libyui/src/libyui.la \ + $(srcdir)/../../libscr/src/libscr.la y2base_DEPENDENCIES = $(YAST2CORE) @@ -33,4 +33,3 @@ y2base_LDFLAGS = \ -Xlinker --whole-archive \ $(YAST2CORE) \ -Xlinker --no-whole-archive - diff --git a/configure.in.in b/configure.in.in new file mode 100644 index 000000000..2e5f1027a --- /dev/null +++ b/configure.in.in @@ -0,0 +1,37 @@ +## core configure.in.in + +## initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-PROGRAM@ + +## special stuff +AM_PROG_LEX +AC_PATH_PROG(GPERF, gperf, false) +if test "$GPERF" = "false"; then + AC_MSG_ERROR([gperf not installed]) + exit +fi +AC_CHECK_PROGS(YACC, 'bison -y -d -v' byacc, false) +if test "$YACC" = false; then + AC_MSG_ERROR([bison not installed]) +fi + +SUSEVERSION=`grep ^VERSION /etc/SuSE-release | cut "-d " -f 3` +AC_SUBST(SUSEVERSION) + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-PROGRAM@ + +## and generate the output +AC_OUTPUT( + libycp/doc/YCP-quoting.html + libycp/doc/YCP-statements.html + libycp/doc/YCP-datatypes.html + libycp/doc/YCP-operators.html + liby2/doc/Y2-access.html + liby2/doc/Y2-components.html + scr/doc/SCR.html + scr/doc/intro_to_scr.html +) +@YAST2-OUTPUT@ diff --git a/libpkg/src/Makefile.am b/libpkg/src/Makefile.am index 1d1d14c88..296761f51 100644 --- a/libpkg/src/Makefile.am +++ b/libpkg/src/Makefile.am @@ -1,9 +1,11 @@ # -# Makefile.am for libpkg/src +# Makefile.am for core/libpkg/src # SUBDIRS = include +AM_CXXFLAGS = -DY2LOG=\"libpkg\" + lib_LTLIBRARIES = libpkg.la libpkg_la_SOURCES = \ @@ -15,6 +17,9 @@ libpkg_la_SOURCES = \ RawPackage.h RawPackage.cc \ ConfigFile.cc RawPackageInfo.cc Solver.cc PackageKey.cc Package.cc -INCLUDES = -I$(srcdir)/include -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/include libpkg_la_LDFLAGS = -version-info 2:0 diff --git a/libpkg/testsuite/Makefile.am b/libpkg/testsuite/Makefile.am index 04a7a5778..52c7e8c30 100644 --- a/libpkg/testsuite/Makefile.am +++ b/libpkg/testsuite/Makefile.am @@ -1,17 +1,21 @@ # -# Makefile.am for lib2/testsuite +# Makefile.am for core/libpkg/testsuite # -INCLUDES= -I$(srcdir)/../src/include -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../src/include bin_PROGRAMS = runpkg runpkg_SOURCES = runpkg.cc runpkg_LDADD = $(srcdir)/../src/libpkg.la -lycp -runpkg_LDFLAGS = -L$(YAST2DIR)/lib +runpkg_LDFLAGS = -L$(YAST2DIR)/lib -L$(srcdir)/../../libycp/src AUTOMAKE_OPTIONS = dejagnu clean-local: - rm -f tmp.err.* tmp.out.* ycp.log ycp.sum site.exp libycp.log libycp.sum site.bak + rm -f tmp.err.* tmp.out.* ycp.log ycp.sum site.exp \ + libycp.log libycp.sum site.bak EXTRA_DIST = README diff --git a/libscr/src/Makefile.am b/libscr/src/Makefile.am index 68a9e35ee..123140bf2 100644 --- a/libscr/src/Makefile.am +++ b/libscr/src/Makefile.am @@ -1,14 +1,19 @@ # -# Makefile.am for libscr/src +# Makefile.am for core/libscr/src # SUBDIRS = include +AM_CXXFLAGS = -DY2LOG=\"libscr\" + lib_LTLIBRARIES = libscr.la libscr_la_SOURCES = \ SCRAgent.cc SCRInterpreter.cc -INCLUDES = -I$(srcdir)/include -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/include libscr_la_LDFLAGS = -version-info 2:0 diff --git a/libscr/testsuite/Makefile.am b/libscr/testsuite/Makefile.am index eb30e0707..18ee23b65 100644 --- a/libscr/testsuite/Makefile.am +++ b/libscr/testsuite/Makefile.am @@ -1,14 +1,18 @@ # -# Makefile.am for libscr/testsuite +# Makefile.am for core/libscr/testsuite # -INCLUDES = -I../src/include -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../src/include bin_PROGRAMS = runscr runscr_SOURCES = runscr.cc runscr_LDADD = ../src/libscr.la -lycp -runscr_LDFLAGS = -L$(libdir) +runscr_LDFLAGS = -L$(libdir) -L$(srcdir)/../../libycp/src +PACKAGE = libscr AUTOMAKE_OPTIONS = dejagnu clean-local: diff --git a/liby2/src/Makefile.am b/liby2/src/Makefile.am index f6b58892d..4f1460e09 100644 --- a/liby2/src/Makefile.am +++ b/liby2/src/Makefile.am @@ -1,11 +1,11 @@ # -# Makefile.am for liby2/src +# Makefile.am for core/liby2/src # SUBDIRS = include -AM_CXXFLAGS = -DYAST2DIR=\"${yast2dir}\" -DPLUGINDIR=\"${plugindir}\" \ - -DEXECCOMPDIR=\"${execcompdir}\" +AM_CXXFLAGS = -DY2LOG=\"liby2\" -DYAST2DIR=\"${yast2dir}\" \ + -DPLUGINDIR=\"${plugindir}\" -DEXECCOMPDIR=\"${execcompdir}\" lib_LTLIBRARIES = liby2.la plugin_LTLIBRARIES = \ @@ -54,4 +54,6 @@ libpy2plugin_la_SOURCES = \ Y2PluginComponent.cc Y2CCPlugin.cc libpy2plugin_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(srcdir)/include -I$(srcdir)/include/y2 -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/include -I$(srcdir)/include/y2 diff --git a/liby2/testsuite/Makefile.am b/liby2/testsuite/Makefile.am index b23b619ec..fca3bb951 100644 --- a/liby2/testsuite/Makefile.am +++ b/liby2/testsuite/Makefile.am @@ -1,24 +1,26 @@ # -# Makefile.am for liby2/testsuite +# Makefile.am for core/liby2/testsuite # AUTOMAKE_OPTIONS = dejagnu -INCLUDES= -I../src/include -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../src/include noinst_PROGRAMS = rungeneric runplugin runprogram runremote \ runscript runserial runstdio rungeneric_SOURCES = runy2.cc rungeneric_LDADD = -lycp -rungeneric_LDFLAGS = -L$(libdir) \ +rungeneric_LDFLAGS = -L$(libdir) -L$(srcdir)/../../libycp/src \ -Xlinker --whole-archive \ ../src/liby2.la \ -Xlinker --no-whole-archive runplugin_SOURCES = $(rungeneric_SOURCES) runplugin_LDADD = -lycp -runplugin_LDFLAGS = -L$(libdir) \ +runplugin_LDFLAGS = -L$(libdir) -L$(srcdir)/../../libycp/src \ -Xlinker --whole-archive \ ../src/liby2.la \ ../src/libpy2plugin.la\ @@ -27,7 +29,7 @@ runplugin_LDFLAGS = -L$(libdir) \ runprogram_SOURCES = $(rungeneric_SOURCES) runprogram_LDADD = -lycp -runprogram_LDFLAGS = -L$(libdir) \ +runprogram_LDFLAGS = -L$(libdir) -L$(srcdir)/../../libycp/src \ -Xlinker --whole-archive \ ../src/liby2.la \ ../src/libpy2program.la \ @@ -36,7 +38,7 @@ runprogram_LDFLAGS = -L$(libdir) \ runremote_SOURCES = $(rungeneric_SOURCES) runremote_LDADD = -lycp -runremote_LDFLAGS = -L$(libdir) \ +runremote_LDFLAGS = -L$(libdir) -L$(srcdir)/../../libycp/src \ -Xlinker --whole-archive \ ../src/liby2.la \ ../src/libpy2remote.la \ @@ -45,7 +47,7 @@ runremote_LDFLAGS = -L$(libdir) \ runscript_SOURCES = $(rungeneric_SOURCES) runscript_LDADD = -lycp -runscript_LDFLAGS = -L$(libdir) \ +runscript_LDFLAGS = -L$(libdir) -L$(srcdir)/../../libycp/src \ -Xlinker --whole-archive \ ../src/liby2.la \ ../src/libpy2script.la \ @@ -54,7 +56,7 @@ runscript_LDFLAGS = -L$(libdir) \ runserial_SOURCES = $(rungeneric_SOURCES) runserial_LDADD = -lycp -runserial_LDFLAGS = -L$(libdir) \ +runserial_LDFLAGS = -L$(libdir) -L$(srcdir)/../../libycp/src \ -Xlinker --whole-archive \ ../src/liby2.la \ ../src/libpy2serial.la \ @@ -63,7 +65,7 @@ runserial_LDFLAGS = -L$(libdir) \ runstdio_SOURCES = $(rungeneric_SOURCES) runstdio_LDADD = -lycp -runstdio_LDFLAGS = -L$(libdir) \ +runstdio_LDFLAGS = -L$(libdir) -L$(srcdir)/../../libycp/src \ -Xlinker --whole-archive \ ../src/liby2.la \ ../src/libpy2stdio.la \ diff --git a/libycp/src/Makefile.am b/libycp/src/Makefile.am index bca117657..593413b68 100644 --- a/libycp/src/Makefile.am +++ b/libycp/src/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = include -AM_CXXFLAGS = -DYAST2DIR=\"${yast2dir}\" +AM_CXXFLAGS = -DY2LOG=\"libycp\" -DYAST2DIR=\"${yast2dir}\" lib_LTLIBRARIES = libycp.la diff --git a/libycp/src/include/ycp/y2log.h b/libycp/src/include/ycp/y2log.h index 63b1dd9c8..50eae55ab 100644 --- a/libycp/src/include/ycp/y2log.h +++ b/libycp/src/include/ycp/y2log.h @@ -47,6 +47,7 @@ void y2_vlogger (loglevel_t level, const char *component, const char *file, #ifdef Y2LOG #define y2log_component Y2LOG #else +#warning Y2LOG not defined #define y2log_component "" #endif diff --git a/libycp/testsuite/Makefile.am b/libycp/testsuite/Makefile.am index 666096c78..21abff522 100644 --- a/libycp/testsuite/Makefile.am +++ b/libycp/testsuite/Makefile.am @@ -14,6 +14,7 @@ parseycp_LDADD = ../src/libycp.la testscope_SOURCES = testscope.cc testscope_LDADD = ../src/libycp.la +PACKAGE = libycp AUTOMAKE_OPTIONS = dejagnu clean-local: diff --git a/libyui/doc/YCP-UI-richtext.html b/libyui/doc/YCP-UI-richtext.html new file mode 100644 index 000000000..62c7bc679 --- /dev/null +++ b/libyui/doc/YCP-UI-richtext.html @@ -0,0 +1,106 @@ +YCP UI Reference: RichText +The RichText widget in the Qt UI currently supports the tags listed +below. Note that not all of them will make sense for use within YaST2 +(Most notably all those which refer to files) + + diff --git a/libyui/src/Makefile.am b/libyui/src/Makefile.am index 9c00d9c06..f855d8083 100644 --- a/libyui/src/Makefile.am +++ b/libyui/src/Makefile.am @@ -1,5 +1,6 @@ # -# Makefile.am for libyui/src +# Makefile.am for core/libyui/src +# SUBDIRS = include @@ -45,7 +46,10 @@ libyui_la_SOURCES = \ YTree.cc \ YWidget.cc -INCLUDES = -I$(srcdir)/include -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/include libyui_la_LDFLAGS = -version-info 2:0 diff --git a/libyui/testsuite/Makefile.am b/libyui/testsuite/Makefile.am index a958ad48d..783c0c43b 100644 --- a/libyui/testsuite/Makefile.am +++ b/libyui/testsuite/Makefile.am @@ -1,13 +1,16 @@ # -# Makefile.am for libyui/testsuite +# Makefile.am for core/libyui/testsuite # -INCLUDES = -I../src/include -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../src/include bin_PROGRAMS = runyui runyui_SOURCES = runyui.cc runyui_LDADD = ../src/libyui.la -lycp -lpthread -runyui_LDFLAGS = -L$(libdir) +runyui_LDFLAGS = -L$(libdir) -L$(srcdir)/../../libycp/src AUTOMAKE_OPTIONS = dejagnu diff --git a/scr/doc/SCR-additional.html b/scr/doc/SCR-additional.html new file mode 100644 index 000000000..57a4864d5 --- /dev/null +++ b/scr/doc/SCR-additional.html @@ -0,0 +1,55 @@ + + + + + SCR additional + + + + + +

Additional SCR Information

+ + +Have a look at these links if you want to code YCP C++ agent or you +want to improve the ycp groundwork. +
+

+ + + + + + + + + + + + + + + + + + +
+ libscr +
+  Libscr Index  An Introduction of the YaST2 component architecture
+ +

+ + +

+ +
www.suse.de +
YaST2 Version 7.1
+
+ + diff --git a/scr/src/Makefile.am b/scr/src/Makefile.am index 6e66cb37f..3b871a0e7 100644 --- a/scr/src/Makefile.am +++ b/scr/src/Makefile.am @@ -1,8 +1,8 @@ # -# Makefile.am for y2scr/src +# Makefile.am for core/scr/src # -AM_CXXFLAGS = -DSUSEVERSION=\"${SUSEVERSION}\" +AM_CXXFLAGS = -DY2LOG=\"scr\" -DSUSEVERSION=\"${SUSEVERSION}\" serversdir = $(execcompdir)/servers servers_PROGRAMS = scr @@ -15,6 +15,9 @@ scr_SOURCES = \ scr_LDADD = -L$(libdir) -lscr -ly2 -lycp scr_LDFLAGS = \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2plugin.la \ $(plugindir)/libpy2stdio.la \ @@ -31,4 +34,7 @@ libpy2scr_la_SOURCES = \ libpy2scr_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include diff --git a/scr/testsuite/Makefile.am b/scr/testsuite/Makefile.am index 83bcd9e11..9be8b817f 100644 --- a/scr/testsuite/Makefile.am +++ b/scr/testsuite/Makefile.am @@ -1,5 +1,5 @@ # -# Makefile.am for y2scr/testsuite +# Makefile.am for core/scr/testsuite # SUBDIRS = config lib scr.test tests @@ -7,25 +7,34 @@ SUBDIRS = config lib scr.test tests PACKAGE = scr AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include noinst_PROGRAMS = runscr y2scr runscr_SOURCES = runscr.cc runscr_LDADD = ../src/libpy2scr.la -ly2 -lycp -lscr -lutil runscr_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ - ../ag_dummy/src/libpy2ag_dummy.la \ + $(plugindir)/libpy2ag_dummy.la \ -Xlinker --no-whole-archive y2scr_SOURCES = y2scr.cc y2scr_LDADD = -L$(libdir) -lscr -ly2 -lycp -y2scr_LDFLAGS = \ +y2scr_LDFLAGS = \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ + -L$(srcdir)/../../libscr/src \ $(all_libraries) \ -Xlinker --whole-archive \ - ../ag_dummy/src/libpy2ag_dummy.la \ - ../ag_dumpto/src/libpy2ag_dumpto.la \ + $(plugindir)/libpy2ag_dummy.la \ + $(plugindir)/libpy2ag_dumpto.la \ ../src/libpy2scr.la \ $(plugindir)/libpy2stdio.la \ $(plugindir)/libpy2script.la \ diff --git a/wfm/src/Makefile.am b/wfm/src/Makefile.am index 50bc54f14..2a8e1a9f4 100644 --- a/wfm/src/Makefile.am +++ b/wfm/src/Makefile.am @@ -1,10 +1,11 @@ # -# Makefile.am for y2wfm/scr +# Makefile.am for core/wfm/scr # SUBDIRS = include -AM_CXXFLAGS = -DSUSEVERSION=\"${SUSEVERSION}\" -DLOCALEDIR=\"${localedir}\" +AM_CXXFLAGS = -DY2LOG=\"wfm\" -DSUSEVERSION=\"${SUSEVERSION}\" \ + -DLOCALEDIR=\"${localedir}\" plugin_LTLIBRARIES = libpy2wfm.la noinst_LTLIBRARIES = liby2wfm.la @@ -18,4 +19,8 @@ libpy2wfm_la_SOURCES = \ Y2WFMComponent.cc Y2CCWFM.cc libpy2wfm_la_LDFLAGS = -version-info 2:0 -INCLUDES = -I$(srcdir)/include -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include \ + -I$(srcdir)/include diff --git a/wfm/testsuite/Makefile.am b/wfm/testsuite/Makefile.am index 2cb1c7538..ad95a9917 100644 --- a/wfm/testsuite/Makefile.am +++ b/wfm/testsuite/Makefile.am @@ -1,17 +1,24 @@ # -# Makefile.am for y2wfm/testsuite +# Makefile.am for core/wfm/testsuite # +SUBDIRS = config lib wfm.test tests + PACKAGE = wfm AUTOMAKE_OPTIONS = dejagnu -SUBDIRS = config lib wfm.test tests -INCLUDES= -I$(srcdir)/../src/include/wfm -I$(includedir) +INCLUDES = \ + -I$(srcdir)/../../libycp/src/include \ + -I$(srcdir)/../../liby2/src/include \ + -I$(srcdir)/../../libscr/src/include \ + -I$(srcdir)/../src/include/wfm noinst_PROGRAMS = runwfm runwfm_SOURCES = runwfm.cc runwfm_LDADD = ../src/liby2wfm.la -ly2 -lycp -lutil -runwfm_LDFLAGS = -L$(libdir) \ +runwfm_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ ../src/liby2wfm.la \ @@ -21,6 +28,8 @@ bin_PROGRAMS = y2wfm y2wfm_SOURCES = y2wfm.cc y2wfm_LDADD = -ly2 -lycp -lutil y2wfm_LDFLAGS = -L$(libdir) \ + -L$(srcdir)/../../libycp/src \ + -L$(srcdir)/../../liby2/src \ -Xlinker --whole-archive \ $(plugindir)/libpy2stdio.la \ $(plugindir)/libpy2script.la \ @@ -28,6 +37,7 @@ y2wfm_LDFLAGS = -L$(libdir) \ -Xlinker --no-whole-archive clean-local: - rm -f tmp.err.* tmp.out.* ycp.log ycp.sum site.exp libycp.log libycp.sum site.bak + rm -f tmp.err.* tmp.out.* ycp.log ycp.sum site.exp \ + libycp.log libycp.sum site.bak EXTRA_DIST = README