April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r46943 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_upgrade_urls.ycp
by locilka＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: locilka Date: Tue Apr 22 12:33:23 2008 New Revision: 46943 URL: http://svn.opensuse.org/viewcvs/yast?rev=46943&view=rev Log: - Fixed filtering-out already registered repos (bnc #379051). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_upgrade_urls.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Apr 22 12:33:23 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 22 12:26:52 CEST 2008 - locilka(a)suse.cz + +- Fixed filtering-out already registered repos (bnc #379051). + +------------------------------------------------------------------- Mon Apr 21 15:28:24 CEST 2008 - locilka(a)suse.cz - Calling 'xset r off' & 'xset m 1' (bnc #376945). Modified: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_up… ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Tue Apr 22 12:33:23 2008 @@ -127,14 +127,14 @@ ), [] ), - `HBox ( + `Left (`HBox ( // TRANSLATORS: Push button `PushButton (`id (`edit), _("&Change...")), `HSpacing (1), // TRANSLATORS: Push button `PushButton (`id (`toggle), _("&Toggle Status")), `HStretch() - ) + )) ), // TRANSLATORS: help text 1/3 _("<p>Here you see all software repositories found @@ -178,6 +178,10 @@ if (currentitem != nil) { UI::ChangeWidget (`id ("table_of_repos"), `CurrentItem, currentitem); } + + boolean enable_buttons = (size (items) > 0); + UI::ChangeWidget (`id (`edit), `Enabled, enable_buttons); + UI::ChangeWidget (`id (`toggle), `Enabled, enable_buttons); } boolean FindCurrentURLStatus (string baseurl) { @@ -340,12 +344,14 @@ // All already registered repos foreach (map one_registered_repo, already_registered_repos, { // if an installation repository is enabled, skip it - if (one_registered_repo["enabled"]:true == false) + if (one_registered_repo["enabled"]:true == false) { + y2milestone ("Repo %1 is not enabled, skipping", one_registered_repo["url"]:one_registered_repo["media"]:nil); return; + } string registered_url = one_registered_repo["url"]:"-A-"; string registered_name = one_registered_repo["name"]:"-A-"; - string registered_dir = one_registered_repo["product_dir"]:"-A-"; + string registered_dir = one_registered_repo["path"]:"/"; // Remove them from repos being offered to user to enable/disable them // Don't handle them at all, they have to stay untouched @@ -353,13 +359,13 @@ urls = filter (map one_from_urls, urls, { string one_url = one_from_urls["url"]:"-B-"; string one_name = one_from_urls["name"]:"-B-"; - string one_dir = one_from_urls["product_dir"]:"-B-"; + string one_dir = one_from_urls["path"]:"/"; if (registered_url == one_url && registered_name == one_name && registered_dir == one_dir) { y2milestone ("The same product (url) already in use, not handling it %1", one_registered_repo); - return true; - } else { return false; + } else { + return true; } }); }); @@ -614,7 +620,7 @@ "media_url" : one_url, "product_dir" : pth, "product" : repo_name, - "autoyast_product" : "", + "autoyast_product" : repo_name, ]); } }); @@ -721,18 +727,20 @@ Progress::NextStage(); Progress::Finish(); - if (size (already_registered_repos) < 1) { + if (already_registered_repos == nil || size (already_registered_repos) < 1) { + y2milestone ("No sources found"); + continue_processing = false; + } else if (urls == nil || size (urls) < 1) { + y2milestone ("No sources to offer"); continue_processing = false; } - if (! continue_processing) { - y2milestone ("No sources found"); - return ret; + if (continue_processing) { + ret = HandleOldSources(); + if (ret == `next) + ret = AddOrRemoveSources(); } - ret = HandleOldSources(); - if (ret == `next) ret = AddOrRemoveSources(); - // for testing purpose if (Mode::normal()) { if (ret == `next) Pkg::SourceSaveAll(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46942 - /branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp
by aschnell＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: aschnell Date: Tue Apr 22 11:42:16 2008 New Revision: 46942 URL: http://svn.opensuse.org/viewcvs/yast?rev=46942&view=rev Log: - removed useless cast Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Tue Apr 22 11:42:16 2008 @@ -37,7 +37,7 @@ if (handle_func != nil) { any user_data = tmp[`user_data]:nil; - handle_func(user_data, (any) widget); + handle_func(user_data, widget); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46941 - /branches/tmp/juhliarik/SP3/bootloader/
by juhliarik＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: juhliarik Date: Tue Apr 22 10:41:03 2008 New Revision: 46941 URL: http://svn.opensuse.org/viewcvs/yast?rev=46941&view=rev Log: create own branch for bootloader Added: branches/tmp/juhliarik/SP3/bootloader/ - copied from r46940, branches/SuSE-SLE-10-SP2-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46940 - /branches/tmp/juhliarik/SP3/
by juhliarik＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: juhliarik Date: Tue Apr 22 10:39:50 2008 New Revision: 46940 URL: http://svn.opensuse.org/viewcvs/yast?rev=46940&view=rev Log: added SP3 directory Added: branches/tmp/juhliarik/SP3/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46939 - /branches/tmp/juhliarik/
by juhliarik＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: juhliarik Date: Tue Apr 22 10:37:02 2008 New Revision: 46939 URL: http://svn.opensuse.org/viewcvs/yast?rev=46939&view=rev Log: create own branch for bootloader Added: branches/tmp/juhliarik/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46938 - /branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp
by aschnell＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: aschnell Date: Tue Apr 22 10:32:11 2008 New Revision: 46938 URL: http://svn.opensuse.org/viewcvs/yast?rev=46938&view=rev Log: - show more data Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp Tue Apr 22 10:32:11 2008 @@ -46,7 +46,9 @@ map<string, map> tg = Storage::GetTargetMap(); - list<symbol> fields = StorageFields::Filter([ `mount_point, `size, `raid_type ]); + list<symbol> fields = StorageFields::Filter([ `mount_point, `size, `raid_type, `newline, + `fs_type, `encrypted, `newline, `uuid, `label, + `used_by ]); UI::ReplaceWidget(`tab_panel, `VBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46937 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: lslezak Date: Tue Apr 22 08:54:05 2008 New Revision: 46937 URL: http://svn.opensuse.org/viewcvs/yast?rev=46937&view=rev Log: - return dependency kind in Pkg::ResolvableDependencies() (bnc#381340) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Apr 22 08:54:05 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 22 08:53:11 CEST 2008 - lslezak(a)suse.cz + +- return dependency kind in Pkg::ResolvableDependencies() + (bnc#381340) + +------------------------------------------------------------------- Fri Apr 18 13:27:33 CEST 2008 - lslezak(a)suse.cz - added Pkg::PkgMediaPackageSizes() to speed up computing Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Tue Apr 22 08:54:05 2008 @@ -365,15 +365,17 @@ try { zypp::Dep depkind(*kind_it); zypp::Capabilities deps = it->resolvable()->dep(depkind); - for (zypp::Capabilities::const_iterator d = deps.begin(); d != deps.end(); ++d) + + zypp::sat::WhatProvides prv(deps); + + for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d) { YCPMap ycpdep; - //FIXME ycpdep->add (YCPString ("res_kind"), YCPString (d.kind().asString())); - ycpdep->add (YCPString ("name"), YCPString (d->asString())); + ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString())); + ycpdep->add (YCPString ("name"), YCPString (d->name())); ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); ycpdeps->add (ycpdep); } - } catch (...) {} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46936 - in /branches/tmp/dmacvicar/yast2-cmake: core/ core/agent-any/ core/agent-any/src/ core/agent-dummy/src/ core/agent-ini/src/ core/agent-modules/ core/agent-modules/src/ core/libycp/src/ cor...
by dmacvicar＠svn.opensuse.org 21 Apr '08

21 Apr '08

Author: dmacvicar Date: Tue Apr 22 00:36:23 2008 New Revision: 46936 URL: http://svn.opensuse.org/viewcvs/yast?rev=46936&view=rev Log: changed y2_add_agent to y2_add_plugin. Most of core builds, even wfm. tricky things: docu (in lot of places is just bogus docu), and the testsuite. I am still thinking about a macro that allows to add a whole skeleton, something like y2_add_plugin_subdirectory Modified: branches/tmp/dmacvicar/yast2-cmake/core/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/core/agent-any/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/core/agent-any/src/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/core/agent-dummy/src/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/core/agent-ini/src/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/core/agent-modules/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/core/agent-modules/src/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/core/libycp/src/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/core/wfm/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/core/wfm/src/CMakeLists.txt branches/tmp/dmacvicar/yast2-cmake/devtools/devtools/cmake/modules/YastCommon.cmake Modified: branches/tmp/dmacvicar/yast2-cmake/core/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -3,9 +3,12 @@ SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) -include_directories(${CMAKE_SOURCE_DIR}/liby2util-r/src/include +include_directories(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/liby2util-r/src/include ${CMAKE_SOURCE_DIR}/liby2/src/include ${CMAKE_SOURCE_DIR}/liby2/src/include/y2 + ${CMAKE_SOURCE_DIR}/wfm/src/include + ${CMAKE_SOURCE_DIR}/wfm/src/include/wfm ${CMAKE_SOURCE_DIR}/libscr/src/include ${CMAKE_SOURCE_DIR}/libscr/src/include/scr ${CMAKE_SOURCE_DIR}/libycp/src/include @@ -16,13 +19,15 @@ include_directories( ${CMAKE_BINARY_DIR} ) find_package(Bison REQUIRED) -#find_package(Flex REQUIRED) -#include(Flex) +find_package(Flex REQUIRED) +include(Flex) add_subdirectory(libycp) add_subdirectory(liby2) add_subdirectory(libscr) +add_subdirectory(wfm) add_subdirectory(agent-dummy) add_subdirectory(agent-ini) - +add_subdirectory(agent-any) +add_subdirectory(agent-modules) Modified: branches/tmp/dmacvicar/yast2-cmake/core/agent-any/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/agent-any/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/agent-any/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -1,17 +1,4 @@ add_subdirectory(src) -add_subdirectory(doc) -add_subdirectory(testsuite) +#add_subdirectory(doc) +#add_subdirectory(testsuite) - -########### install files ############### - - - - -#original Makefile.am contents follow: - -## -## Makefile.am for core/agent-any -## -# -#SUBDIRS = src doc testsuite Modified: branches/tmp/dmacvicar/yast2-cmake/core/agent-any/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/agent-any/src/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/agent-any/src/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -1,43 +1,2 @@ -########### next target ############### - -SET(y2ag_anyagent_STAT_SRCS - AnyAgent.cc - AnyAgent.h - AnyAgentBasic.cc - AnyAgentComplex.cc -) - -add_library(y2ag_anyagent STATIC ${y2ag_anyagent_STAT_SRCS}) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -## -## Makefile.am for core/agent-any/src -## -# -#AM_CXXFLAGS = -DY2LOG=\"agent-any\" -# -#plugin_LTLIBRARIES = libpy2ag_anyagent.la -#noinst_LTLIBRARIES = liby2ag_anyagent.la -# -#liby2ag_anyagent_la_SOURCES = \ -# AnyAgent.cc AnyAgent.h \ -# AnyAgentBasic.cc \ -# AnyAgentComplex.cc -#liby2ag_anyagent_la_LDFLAGS = -version-info 2:0 -#liby2ag_anyagent_la_LIBADD = @AGENT_LIBADD@ -# -#libpy2ag_anyagent_la_SOURCES = \ -# $(liby2ag_anyagent_la_SOURCES) \ -# Y2CCAnyAgent.cc -#libpy2ag_anyagent_la_LDFLAGS = -version-info 2:0 -#libpy2ag_anyagent_la_LIBADD = @AGENT_LIBADD@ -# -#INCLUDES = @AGENT_INCLUDES@ +y2_add_plugin(ag_any) Modified: branches/tmp/dmacvicar/yast2-cmake/core/agent-dummy/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/agent-dummy/src/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/agent-dummy/src/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -1,3 +1,3 @@ -y2_add_agent(dummy) +y2_add_plugin(dummy) Modified: branches/tmp/dmacvicar/yast2-cmake/core/agent-ini/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/agent-ini/src/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/agent-ini/src/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -1,3 +1,3 @@ -y2_add_agent(ini IniAgent.cc IniAgent.h IniParser.cc IniParser.h IniFile.cc IniFile.h) +y2_add_plugin(ag_ini IniAgent.cc IniAgent.h IniParser.cc IniParser.h IniFile.cc IniFile.h) Modified: branches/tmp/dmacvicar/yast2-cmake/core/agent-modules/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/agent-modules/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/agent-modules/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -1,18 +1,5 @@ -add_subdirectory(conf) -add_subdirectory(doc) +#add_subdirectory(conf) +#add_subdirectory(doc) add_subdirectory(src) -add_subdirectory(testsuite) +#add_subdirectory(testsuite) - -########### install files ############### - - - - -#original Makefile.am contents follow: - -## -## Makefile.am for core/agent-modules -## -# -#SUBDIRS = conf doc src testsuite Modified: branches/tmp/dmacvicar/yast2-cmake/core/agent-modules/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/agent-modules/src/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/agent-modules/src/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -1,44 +1,3 @@ -########### next target ############### +y2_add_plugin(ag_modules) -SET(y2ag_modules_STAT_SRCS - ModulesConf.h - ModulesConf.cc - ModulesAgent.h - ModulesAgent.cc - Y2Logger.h -) - -add_library(y2ag_modules STATIC ${y2ag_modules_STAT_SRCS}) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -## -## Makefile.am for core/agent-modules/src -## -# -#AM_CXXFLAGS = -DY2LOG=\"agent-modules\" -# -#plugin_LTLIBRARIES = libpy2ag_modules.la -#noinst_LTLIBRARIES = liby2ag_modules.la -# -#liby2ag_modules_la_SOURCES = \ -# ModulesConf.h ModulesConf.cc \ -# ModulesAgent.h ModulesAgent.cc \ -# Y2Logger.h -#liby2ag_modules_la_LDFLAGS = -version-info 2:0 -#liby2ag_modules_la_LIBADD = @AGENT_LIBADD@ -# -#libpy2ag_modules_la_SOURCES = \ -# $(liby2ag_modules_la_SOURCES) \ -# Y2CCModulesAgent.cc -#libpy2ag_modules_la_LDFLAGS = -version-info 2:0 -#libpy2ag_modules_la_LIBADD = @AGENT_LIBADD@ -# -#INCLUDES = ${AGENT_INCLUDES} Modified: branches/tmp/dmacvicar/yast2-cmake/core/libycp/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/libycp/src/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/libycp/src/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -69,10 +69,9 @@ y2crypt.cc y2crypt.h ${BISON_ycpParser_OUTPUTS} - scanner.cc ) -#add_flex_files( ${ycp_lib_SRCS} scanner.ll) +add_flex_files( ${ycp_lib_SRCS} scanner.ll) add_library(ycp SHARED ${ycp_LIB_SRCS}) target_link_libraries(ycp xcrypt ycpvalues y) Modified: branches/tmp/dmacvicar/yast2-cmake/core/wfm/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/wfm/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/wfm/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -1,17 +1,4 @@ add_subdirectory(src) -add_subdirectory(doc) -add_subdirectory(testsuite) +#add_subdirectory(doc) +#add_subdirectory(testsuite) - -########### install files ############### - - - - -#original Makefile.am contents follow: - -## -## Makefile.am for core/wfm -## -# -#SUBDIRS = src doc testsuite Modified: branches/tmp/dmacvicar/yast2-cmake/core/wfm/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/cor… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/core/wfm/src/CMakeLists.txt (original) +++ branches/tmp/dmacvicar/yast2-cmake/core/wfm/src/CMakeLists.txt Tue Apr 22 00:36:23 2008 @@ -1,54 +1,11 @@ -include_directories(${CMAKE_SOURCE_DIR}/libycp/src/include ${CMAKE_SOURCE_DIR}/liby2/src/include ${CMAKE_SOURCE_DIR}/libscr/src/include ) +#include_directories(${CMAKE_SOURCE_DIR}/libycp/src/include ${CMAKE_SOURCE_DIR}/liby2/src/include ${CMAKE_SOURCE_DIR}/libscr/src/include ) +add_definitions(-DSUSEVERSION=\\\"${VERSION}\\\") +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +y2_add_plugin(wfm) -########### install files ############### +#install(FILES Y2WFMComponent.h WFMSubAgent.h WFM.h DESTINATION /include/wfm) -install(FILES Y2WFMComponent.h WFMSubAgent.h WFM.h DESTINATION /include/wfm) -#original Makefile.am contents follow: - -## -## Makefile.am for core/wfm/src -## -# -#AM_CXXFLAGS = -DY2LOG=\"wfm\" -DSUSEVERSION=\"${SUSEVERSION}\" \ -# -DLOCALEDIR=\"${localedir}\" -# -#plugin_LTLIBRARIES = libpy2wfm.la -# -#libpy2wfm_la_SOURCES = \ -# Y2WFMComponent.cc Y2WFMComponent.h \ -# Y2CCWFM.cc Y2CCWFM.h \ -# WFM.cc WFM.h \ -# WFMSubAgent.cc WFMSubAgent.h \ -# Y2SystemNamespace.cc \ -# Y2SystemNamespace.h \ -# Y2StdioFunction.cc \ -# Y2StdioFunction.h \ -# Y2SystemFunction.h \ -# Y2SystemFunction.cc -# -# -## use this for KMTrace: libpy2wfm_la_LIBADD = liby2wfm.la /opt/kde3/lib/libktrace_s.a -#libpy2wfm_la_LDFLAGS = -version-info 2:0 -#libpy2wfm_la_LIBADD = \ -# ../../scr/src/libpy2scr.la \ -# ../../libscr/src/libscr.la \ -# ../../libycp/src/libycp.la \ -# ../../liby2/src/liby2.la \ -# ${Y2UTIL_LIBS} -# -#INCLUDES = \ -# -I$(top_srcdir)/libycp/src/include \ -# -I$(top_srcdir)/liby2/src/include \ -# -I$(top_srcdir)/libscr/src/include \ -# ${Y2UTIL_CFLAGS} -# -#wfmincludedir = $(includedir)/wfm -# -#wfminclude_HEADERS = \ -# Y2WFMComponent.h \ -# WFMSubAgent.h \ -# WFM.h Modified: branches/tmp/dmacvicar/yast2-cmake/devtools/devtools/cmake/modules/YastCommon.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/yast2-cmake/dev… ============================================================================== --- branches/tmp/dmacvicar/yast2-cmake/devtools/devtools/cmake/modules/YastCommon.cmake (original) +++ branches/tmp/dmacvicar/yast2-cmake/devtools/devtools/cmake/modules/YastCommon.cmake Tue Apr 22 00:36:23 2008 @@ -10,8 +10,14 @@ # YAST_IMAGE_DIR # YAST_DATA_DIR # +# Y2_ADD_AGENT(name SRCS) - adds an agent using the provided +# name. If no SRCS is provided, the current srcdir will be scanned +# for .cc files. The agent will be installed in the YaST plugin dir +# +# +# +# # - #SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -Woverloaded-virtual" ) #SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall" ) @@ -188,17 +194,18 @@ ) ENDMACRO(GENERATE_PACKAGING) -macro(y2_add_agent) +macro(y2_add_plugin) set(name ${ARGV0}) set(srcs ${ARGV1}) if(NOT srcs) file( GLOB srcs ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ) endif(NOT srcs) - add_library(pyag_${name} SHARED ${srcs}) - SET_TARGET_PROPERTIES( pyag_${name} PROPERTIES VERSION 2.0 ) - SET_TARGET_PROPERTIES( pyag_${name} PROPERTIES SOVERSION 2 ) - add_definitions(-DY2LOG=\\\"pyag_${name}\\\") - install(TARGETS pyag_${name} DESTINATION YAST_PLUGIN_DIR) -endmacro(y2_add_agent) + add_library(py${name} SHARED ${srcs}) + SET_TARGET_PROPERTIES( py${name} PROPERTIES VERSION 2.0 ) + SET_TARGET_PROPERTIES( py${name} PROPERTIES SOVERSION 2 ) + add_definitions(-DY2LOG=\\\"py${name}\\\") + install(TARGETS py${name} DESTINATION YAST_PLUGIN_DIR) +endmacro(y2_add_plugin) + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46935 - /trunk/gtk/package/yast2-gtk.changes
by jproseve＠svn.opensuse.org 21 Apr '08

21 Apr '08

Author: jproseve Date: Mon Apr 21 20:09:42 2008 New Revision: 46935 URL: http://svn.opensuse.org/viewcvs/yast?rev=46935&view=rev Log: Get the date right Modified: trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Mon Apr 21 20:09:42 2008 @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Mar 28 21:28:56 CET 2008 - jpr(a)suse.de +Mon Apr 21 20:13:49 CEST 2008 - jpr(a)suse.de - Fix live installer sizing (bnc #381153) - Combo box improvements -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46934 - /trunk/gtk/package/yast2-gtk.changes
by jproseve＠svn.opensuse.org 21 Apr '08

21 Apr '08

Author: jproseve Date: Mon Apr 21 20:07:08 2008 New Revision: 46934 URL: http://svn.opensuse.org/viewcvs/yast?rev=46934&view=rev Log: Package changes Modified: trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Mon Apr 21 20:07:08 2008 @@ -1,6 +1,13 @@ ------------------------------------------------------------------- Tue Mar 28 21:28:56 CET 2008 - jpr(a)suse.de +- Fix live installer sizing (bnc #381153) +- Combo box improvements +- Minor warning fixes + +------------------------------------------------------------------- +Tue Mar 28 21:28:56 CET 2008 - jpr(a)suse.de + - don't hide package info/control view once shown (bnc #373474) ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0