September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41157 - /branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/BootCommon.ycp
by odabrunz＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: odabrunz Date: Thu Sep 27 18:49:04 2007 New Revision: 41157 URL: http://svn.opensuse.org/viewcvs/yast?rev=41157&view=rev Log: - do not install bootloader in XEN paravirtualized DomU (#308451) Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/BootCommon.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/BootCommon.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/modules/BootCommon.ycp Thu Sep 27 18:49:04 2007 @@ -916,9 +916,9 @@ if (loader_type == "s390") loader_type = "zipl"; y2milestone ("Bootloader detection returned %1", loader_type); - if (Arch::is_uml ()) + if (Arch::is_uml () || Arch::is_xenU()) { - y2milestone ("Not installing any bootloader for UML"); + y2milestone ("Not installing any bootloader for UML/Xen PV"); loader_type = "none"; } if (loader_type == "grub" && Storage::UseLilo()) -- 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] r41156 - in /branches/tmp/sh/mod-ui/ncurses/src: NCPopup.cc NCPopup.h README_mod-ui
by gs＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: gs Date: Thu Sep 27 18:07:41 2007 New Revision: 41156 URL: http://svn.opensuse.org/viewcvs/yast?rev=41156&view=rev Log: move post() from .h to .cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc Thu Sep 27 18:07:41 2007 @@ -34,7 +34,7 @@ NCPopup::NCPopup( const wpos at, const bool boxed ) : NCDialog( wopt, at, boxed ) { - NCMIL << "Constructor NCPopup - creates NCDialog" << endl; + } /////////////////////////////////////////////////////////////////// @@ -59,9 +59,7 @@ // void NCPopup::popupDialog() { - NCMIL << "popupDialog calls initDialog()" << endl; initDialog(); - NCMIL << "Call showDialog() " << endl; showDialog(); activate ( true ); while ( !(postevent = userInput()) ) @@ -97,3 +95,17 @@ return NCDialog::wHandleInput( ch ); } +int NCPopup::post( NCursesEvent * returnevent ) +{ + postevent = NCursesEvent(); + do { + popupDialog(); + } while ( postAgain() ); + popdownDialog(); + if ( returnevent ) + *returnevent = postevent; + + NCMIL << "Return: " << postevent.detail << endl; + + return postevent.detail; +} Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h Thu Sep 27 18:07:41 2007 @@ -60,16 +60,7 @@ public: - int post( NCursesEvent * returnevent = 0 ) { - postevent = NCursesEvent(); - do { - popupDialog(); - } while ( postAgain() ); - popdownDialog(); - if ( returnevent ) - *returnevent = postevent; - return postevent.detail; - } + int post( NCursesEvent * returnevent = 0 ); }; Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/REA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Thu Sep 27 18:07:41 2007 @@ -81,7 +81,8 @@ NCIntField ---------- Don't create NCPopupTextEntry on the stack !!! -TODO: test thoroughly, esp. calling NCPopupTextEntry +TODO: test thoroughly, IntField2.ycp: NCPopupTextEntry is created + when a digit is typed NCPopupTextEntry @@ -103,5 +104,5 @@ NCAskForDirectory/NCAskForFile ------------------------------ TODO: CheckBox Show details doesn't work - test FileSelection.ycp and FileSelection2.ycp thoroughly + test examples FileSelection.ycp and FileSelection2.ycp thoroughly ComboBox entries are added twice -- 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] r41155 - /branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui
by gs＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: gs Date: Thu Sep 27 17:53:19 2007 New Revision: 41155 URL: http://svn.opensuse.org/viewcvs/yast?rev=41155&view=rev Log: more infos Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/REA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Thu Sep 27 17:53:19 2007 @@ -6,15 +6,8 @@ with_threads = false; -NCWidget.h ----------- -Which constructor is default? -NCWidget(YWidget * parent = 0) which was added or -NCWidget(NCWidget *myparent = 0) like before? - - NCTree -====== +------ YItemIterator itemsBegin()/itemsEnd() used to iterate over toplevel items YItemIterator YTreeItem::childrenBegin()/childrenEnd() used to iterate over children @@ -31,19 +24,18 @@ EVENTs ------ -TODO: remove YCPValue result; from NCursesEvent (check where 'result' is used, - maybe a string value can be used) +TODO: remove YCPValue result; from NCursesEvent (check where 'result' is used, + maybe a string value can be used) RadioButtonGroup -================ -TODO: check whether focusNext/Prev work correctly +---------------- +TODO: check whether focusNext/Prev work correctly SelectionBox -============ +------------ selectItem() added - addItem (string, bool ) added TODO: test NCPkgPopupDeps which uses addItem(string, bool) @@ -52,18 +44,25 @@ ---------- Don't create widget NCPopupList on the stack!!! This leads to segfault when widgets are deleted from YUI at the end! -call YDialog::deleteTopmostDialog(); to delete NCPopupList +call YDialog::deleteTopmostDialog(); to delete NCPopupList +FIXME: entries are added twice -> see FileSelection examples + NCPopupMenu/NCMenuButton ------------------------- Don't create NCPopupMenu on the stack - reason see above + NCMenuButton ------------- -TODO: selection set correctly? +TODO: check whether selection is set correctly + +YNCursesUI.cc +------------- Don't create NCAskForDirectory/NCAskForExistingFile/NCAskForExistingDirectory -on the stack (->YNCursesUI.cc) +on the stack + NCFrame ------- @@ -71,22 +70,38 @@ stretchable, the frame also is stretchable -> NCAskForDirectory/NCAskForFile: setStretchable for NCComboBox true + NCInputField ------------ -TODO: what's the difference between InputMaxLength and maxInputLength ??? +property 'mayedit' removed, is not supported for InputField - was never +supported before (for TextEntry) +TODO: what's the difference between InputMaxLength and maxInputLength ??? + NCIntField ---------- Don't create NCPopupTextEntry on the stack !!! +TODO: test thoroughly, esp. calling NCPopupTextEntry + NCPopupTextEntry ---------------- YCP... removed + NCDialog -------- -don't call 'delete' for helpPopup use deleteTopmostDialog() instead - +don't call 'delete' for helpPopup use deleteTopmostDialog() instead ! +TODO: check code concerning helpPopup + + NCPopupInfo ----------- -check NCPopupInfo (F1) +check NCPopupInfo->setNiceSize + + +NCAskForDirectory/NCAskForFile +------------------------------ +TODO: CheckBox Show details doesn't work + test FileSelection.ycp and FileSelection2.ycp thoroughly + ComboBox entries are added twice -- 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] r41154 - /branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc
by gs＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: gs Date: Thu Sep 27 17:41:47 2007 New Revision: 41154 URL: http://svn.opensuse.org/viewcvs/yast?rev=41154&view=rev Log: temporaily set parent for FileTable Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Thu Sep 27 17:41:47 2007 @@ -186,7 +186,7 @@ opt.keyEvents.setValue( true ); dirList = new NCDirectoryTable( hSplit1, opt, NCFileSelection::T_Overview, YCPString(startDir) ); - // FIXME - remove this - will be obsolete when NCTable is migrated + // FIXME - remove this - will be obsolete when NCTable is migrated dirList->setParent( hSplit1 ); hSplit1->addChild( dirList ); // remove this @@ -196,8 +196,15 @@ // add the list of files fileList = new NCFileTable( hSplit1, opt, NCFileSelection::T_Overview, filter, YCPString(startDir) ); + + // FIXME - remove this - will be obsolete when NCTable is migrated + fileList->setParent( hSplit1 ); + hSplit1->addChild( fileList ); + // remove this + YStringWidgetID * dirFileID = new YStringWidgetID( idFileList ); fileList->setId( dirFileID ); + opt.notifyMode.setValue( false ); opt.keyEvents.setValue( false ); @@ -219,7 +226,7 @@ // label for text field showing the filter (e.g. *.bak) NCComboBox * extension = new NCComboBox( hSplit2, _( "Filter:" ), edit ); // editable as set in edit - + extension->setStretchable( YD_HORIZ, true ); extension->addItem( filter, true ); // selected -- 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] r41153 - /branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc
by gs＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: gs Date: Thu Sep 27 17:33:35 2007 New Revision: 41153 URL: http://svn.opensuse.org/viewcvs/yast?rev=41153&view=rev Log: add comment Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc Thu Sep 27 17:33:35 2007 @@ -344,6 +344,14 @@ return image; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : createPackageSelector +// METHOD TYPE : YPackageSelector * +// +// DESCRIPTION : Calls NCPackageSelectorPlugin::createPackageSelector +// YPackageSelector * NCWidgetFactory::createPackageSelector( YWidget * parent, long modeFlags ) { @@ -358,6 +366,14 @@ return 0; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : createPkgSpecial +// METHOD TYPE : YWidget +// DESCRIPTION : creates special widgets used for the package selection +// dialog (which do not have a corresponding widget in qt-ui) +// YWidget * NCWidgetFactory::createPkgSpecial( YWidget * parent, const string & subwidget ) { -- 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] r41152 - /branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc
by gs＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: gs Date: Thu Sep 27 17:32:17 2007 New Revision: 41152 URL: http://svn.opensuse.org/viewcvs/yast?rev=41152&view=rev Log: call YDialog::deleteTopmostDialog() after helpPopup->popdown() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCD… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Thu Sep 27 17:32:17 2007 @@ -184,7 +184,7 @@ if ( helpPopup ) { - delete helpPopup; + YDialog::deleteTopmostDialog(); } } @@ -1176,6 +1176,8 @@ if ( helpPopup ) { helpPopup->popdown(); + YDialog::deleteTopmostDialog(); + helpPopup = 0; } else { @@ -1217,11 +1219,12 @@ helpText ), "" ); - helpPopup->setNiceSize( NCurses::cols()/3, NCurses::lines()/3 ); - } + if ( helpPopup ) { + helpPopup->setNiceSize( NCurses::cols()/3, NCurses::lines()/3 ); + if ( !helpPopup->isVisible() ) { helpPopup->popup(); -- 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] r41151 - /trunk/ntp-client/src/ntp-client_proposal.ycp
by kmachalkova＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: kmachalkova Date: Thu Sep 27 17:28:57 2007 New Revision: 41151 URL: http://svn.opensuse.org/viewcvs/yast?rev=41151&view=rev Log: Added visual feedback for running ntpdate in installation proposal (#328469) Modified: trunk/ntp-client/src/ntp-client_proposal.ycp Modified: trunk/ntp-client/src/ntp-client_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/ntp-client_propos… ============================================================================== --- trunk/ntp-client/src/ntp-client_proposal.ycp (original) +++ trunk/ntp-client/src/ntp-client_proposal.ycp Thu Sep 27 17:28:57 2007 @@ -17,6 +17,7 @@ import "Package"; import "Packages"; import "Pkg"; +import "Popup"; y2milestone("----------------------------------------"); y2milestone("Ntp client proposal started"); @@ -147,6 +148,7 @@ ret = `invalid_hostname; else { + Popup::ShowFeedback("", _("Synchronizing with NTP server...")); y2milestone("Running ntpdate to sync with %1", ntp_server); integer status = -1; @@ -173,6 +175,7 @@ Packages::addAdditionalPackage("yast2-ntp-client"); integer r = (integer) SCR::Execute (.target.bash, sformat ("/usr/sbin/ntpdate '%1'", String::Quote(ntp_server))); + Popup::ClearFeedback(); y2milestone ("'ntpdate %1' returned %2", ntp_server, r); if( !Stage::initial()) -- 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] r41150 - /trunk/devtools/devtools/bin/y2makeall
by ckornacker＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: ckornacker Date: Thu Sep 27 16:47:17 2007 New Revision: 41150 URL: http://svn.opensuse.org/viewcvs/yast?rev=41150&view=rev Log: added some features (see yast-devel) Modified: trunk/devtools/devtools/bin/y2makeall Modified: trunk/devtools/devtools/bin/y2makeall URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/y2makeall?… ============================================================================== --- trunk/devtools/devtools/bin/y2makeall (original) +++ trunk/devtools/devtools/bin/y2makeall Thu Sep 27 16:47:17 2007 @@ -73,6 +73,7 @@ my $work_root = $ENV{'PWD'}; +my $build_root = $work_root . "/build"; my $make_log = $work_root . "/make.log"; my $failed_log = $work_root . "/failed-packages.log"; @@ -86,6 +87,14 @@ my $dry_run = 0; my $prefix = "/usr"; my $enable_print_summary = 1; +my $enable_make_zypp = 0; +my $libzypp_source = ""; +my $libzypp_prefix = "/usr"; +my $icecream_prefix = "/opt/icecream"; +my $jobs = 8; + +# cmake defines +my $zypp_defines = ""; # Verbosity values @@ -152,6 +161,8 @@ my $dump_build_order = 0; my $dump_dependencies = 0; my $ignore_libzypp = 0; + my $build_libzypp = 0; + my $enable_icecream = 0; GetOptions( "favourites-only" => \$favourites_only, "fast" => \$disable_make_makefile_cvs, @@ -161,6 +172,12 @@ "dump-dependencies" => \$dump_dependencies, "dry-run" => \$dry_run, "ignore-libzypp" => \$ignore_libzypp, + "build-libzypp" => \$build_libzypp, + "libzypp-source=s" => \$libzypp_source, + "libzypp-prefix=s" => \$libzypp_prefix, + "icecream" => \$enable_icecream, + "icecream-prefix=s" => \$icecream_prefix, + "jobs=i" => \$jobs, "verbose" => \$verbose, "debug" => \$debug, "silent" => \$silent, @@ -196,13 +213,36 @@ die "FATAL: Call \"$prog_name\" from your YaST2 CVS or Subversion working directory! (yast2/source)\n" unless -f "devtools/RPMNAME"; + # + # Check if correct zypp directory was specified + # + + if ( $build_libzypp ) { + die "FATAL: wrong zypp source dir specified!\n" + unless -f "$libzypp_source/libzypp.pc.cmake"; + } # - # Make sure we have exactly one version of libzypp installed + # Set up logs # + open( LOG, ">" . $make_log ) or warn "Couldn't open $make_log"; + open( FAILED_LOG, ">" . $failed_log ) or warn "Couldn't open $failed_log"; + $OUTPUT_AUTOFLUSH = 1; + + # + # Build libzypp if necessary and + # make sure we have exactly one version of libzypp installed + # + + make_libzypp_build() if $build_libzypp; check_libzypp() unless $ignore_libzypp; + # + # disable icecream_prefix if we don't need it + # + + $icecream_prefix = "" unless $enable_icecream; # # All remaining command line parameters go to "make". @@ -223,14 +263,6 @@ # - # Set up logs - # - - open( LOG, ">" . $make_log ) or warn "Couldn't open $make_log"; - open( FAILED_LOG, ">" . $failed_log ) or warn "Couldn't open $failed_log"; - $OUTPUT_AUTOFLUSH = 1; - - # # Make a hash from the exclude list # @@ -828,6 +860,20 @@ #----------------------------------------------------------------------------- +# Build libzypp + +sub make_libzypp_build() +{ + # zypp cmake defines + + my $zypp_defines = "-DCMAKE_INSTALL_PREFIX=$libzypp_prefix"; + + cmake( $libzypp_source, $zypp_defines ); + +} + +#----------------------------------------------------------------------------- + # Build in build order sub make_in_build_order() @@ -870,6 +916,101 @@ } } +#----------------------------------------------------------------------------- + +# Make cmake package. +# +# Parameters: +# $dir source dir +# $defines cmake build defines + +sub cmake() +{ + my( $pkg_dir, $defines ) = @_; + my $error = 0; + my $pkg = basename( $pkg_dir ); + + chdir $work_root; + + log_progress( "Building", $pkg ); + log_progress( "\tcreate temp. build dir" ); + + system_int( "mkdir -p $build_root/$pkg >>$make_log 2>&1" ); + + if ( $CHILD_ERROR ) + { + log_error( "'mkdir -p $build_root/$pkg' failed for $pkg: $!" ); + $error = 1; + } + + # + # cmake in build dir + # + + if ( ! $error ) + { + chdir "$build_root/$pkg"; + + log_progress( "\tcmake build in $pkg_dir" ); + + system_int( "cmake $defines $pkg_dir >>$make_log 2>&1" ); + + if ( $CHILD_ERROR ) + { + log_error( "'cmake $defines $pkg_dir' failed for $pkg" ); + $error = 1; + } + } + + # + # make + # + + if ( ! $error ) + { + log_progress ( "\tmake $pkg" ); + system_int( "make -C $build_root/$pkg -j$jobs $make_target >>$make_log 2>&1" ); + + if ( $CHILD_ERROR ) + { + log_error( "'make -C $build_root/$pkg -j$jobs $make_target' failed for $pkg" ); + $error = 1; + } + } + + # + # sudo make install + # + + if ( $make_target eq "" && ! $error ) + { + log_progress( "\t$sudo_cmd make -C $build_root/$pkg install" ); + sudo_system_int( "make -C $build_root/$pkg install >>$make_log 2>&1" ); + + if ( $CHILD_ERROR ) + { + log_error( "'$sudo_cmd make -C $build_root/$pkg install' failed for $pkg" ); + $error = 1; + } + } + + # + # Summary + # + + if ( $error ) + { + push( @failed_dirs, $pkg ); + print FAILED_LOG "$pkg\n"; + } + else + { + log_progress( "\tOK" ); + $successful_count++; + } + + chdir $work_root; +} #----------------------------------------------------------------------------- @@ -888,6 +1029,38 @@ log_progress( "Building", basename( $pkg_dir ) ); + my $make_env = ""; + my $path = ""; + my $pkg_config_path = ""; + my $ld_library_path = ""; + my $perllib = ""; + + # + # prepare make environment + # + + # libzypp pkgconfig path + $ld_library_path = "$libzypp_prefix/lib64:$libzypp_prefix/lib"; + $pkg_config_path = "$libzypp_prefix/lib64/pkgconfig:$libzypp_prefix/lib/pkgconfig:"; + + # YaST pkgconfig path + + $pkg_config_path .= "$prefix/lib64/pkgconfig:$prefix/lib/pkgconfig:$prefix/share/pkgconfig:"; + + # perl libs + $perllib = "$prefix/lib/perl5/5.8.8/x86_64-linux-thread-multi:$prefix/lib/perl5/5.8.8:" . + "$prefix/lib/perl5/vendor_perl/5.8.8/x86_64-linux-thread-multi:$prefix/lib/perl5/vendor_perl/5.8.8:" . + "$prefix/lib/perl5/vendor_perl"; + + # PATH + + $path = "$prefix/bin:\$PATH"; + $path = "$icecream_prefix/bin:" . $path if $icecream_prefix; + + # install prefix and PKG_CONFIG_PATH + + $make_env = "YCPC_Y2DIR=$prefix/share/YaST2 PREFIX=$prefix PKG_CONFIG_PATH=\"$pkg_config_path\$PKG_CONFIG_PATH\" PATH=\"$path\" YCPC_LD_LIBRARY_PATH=\"$ld_library_path\" PERLLIB=\"$perllib\""; + # Check if "make -f Makefile.cvs" must be performed. # Even if command line option "-f" (fast mode - sets $disable_make_makefile_cvs) @@ -908,7 +1081,7 @@ system_int( "rm -rf autom4te.cache >>$make_log 2>&1" ) unless $dry_run; log_progress( "\tmake -f Makefile.cvs" ); - system_int( "make -f Makefile.cvs >>$make_log 2>&1" ) unless $dry_run; + system_int( "$make_env make -e -f Makefile.cvs >>$make_log 2>&1" ) unless $dry_run; if ( $CHILD_ERROR ) { @@ -925,11 +1098,11 @@ if ( ! $error ) { log_progress( "\tmake $make_target" ); - system_int( "make $make_target >>$make_log 2>&1" ) unless $dry_run; + system_int( "$make_env make -e -j$jobs $make_target >>$make_log 2>&1" ) unless $dry_run; if ( $CHILD_ERROR ) { - log_error( "'make $make_target' failed for $pkg_dir" ); + log_error( "'make -j$jobs $make_target' failed for $pkg_dir" ); $error = 1; } } @@ -1047,7 +1220,7 @@ sub check_libzypp() { - my @libs = </usr/lib/libzypp.so* /usr/lib64/libzypp.so.*>; + my @libs = <$libzypp_prefix/lib/libzypp.so* $libzypp_prefix/lib64/libzypp.so.*>; my @libzypp; my $libzypp_count = 0; my $lib; @@ -1079,7 +1252,7 @@ { die <<EOF -FATAL: No libzypp found below /usr/lib or /usr/lib64 +FATAL: No libzypp found below $libzypp_prefix/lib or $libzypp_prefix/lib64 If you are absolutely sure that this is OK, use --ignore-libzypp to override. @@ -1201,11 +1374,19 @@ --prefix <prefix> use <prefix> instead of /usr -n (--no-sudo) do not sudo certain commands (useful with --prefix) + --build-libzypp build libzypp, too + --libzypp-source <dir> libzypp source directory, required for building libzypp + --libzypp-prefix <prefix> use <prefix> instead of /usr + --dump-build-order only dump the build order to stdout and log --dump-dependencies only dump package dependencies to stdout and log --dry-run do not build anything, only print what would be done --ignore-libzypp do not complain if multiple versions of libzypp are installed + --icecream build on icecream + --icecream-prefix <prefix> use <prefix> instead of /opt/icecream + --jobs Specifies the number of jobs to run simultaneously (default 8) + -v (--verbose) verbose output -d (--debug) debug output (even more verbose) -s (--silent) turn verbosity down -- 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] r41149 - in /branches/tmp/sh/mod-ui/ncurses/src: YNCursesUI.cc YNCursesUI.h
by gs＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: gs Date: Thu Sep 27 16:26:58 2007 New Revision: 41149 URL: http://svn.opensuse.org/viewcvs/yast?rev=41149&view=rev Log: remove obsolete code Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Thu Sep 27 16:26:58 2007 @@ -334,59 +334,9 @@ dlg->closeDialog(); } -/////////////////////////////////////////////////////////////////// -// -// Widget creation functions - container widgets -// -/////////////////////////////////////////////////////////////////// - #define ONCREATE WIDDBG << endl //#define ONCREATE -#if 0 -YLayoutBox * YNCursesUI::createSplit( YWidget * parent, YWidgetOpt & opt, - YUIDimension dimension ) -{ - ONCREATE; - return new NCLayoutBox( parent, dimension ); -} - -YSingleChildContainerWidget * YNCursesUI::createReplacePoint( YWidget * parent ) -{ - ONCREATE; - return new NCReplacePoint( parent ); -} - -YSingleChildContainerWidget * YNCursesUI::createAlignment( YWidget * parent, - YAlignmentType halign, - YAlignmentType valign ) -{ - ONCREATE; - return new NCAlignment( parent, halign, valign ); -} - -YSingleChildContainerWidget * YNCursesUI::createSquash( YWidget * parent, - bool hsquash, - bool vsquash ) -{ - ONCREATE; - return new NCSquash( parent, hsquash, vsquash ); -} - -YSingleChildContainerWidget * YNCursesUI::createFrame( YWidget * parent, - const string & label ) -{ - ONCREATE; - return new NCFrame( parent, label ); -} - -YSingleChildContainerWidget * YNCursesUI::createCheckBoxFrame( YWidget * parent, - const string & label, bool checked ) -{ - ONCREATE; - return new NCCheckBoxFrame( parent, label, checked ); -} -#endif /////////////////////////////////////////////////////////////////// // @@ -394,31 +344,6 @@ // /////////////////////////////////////////////////////////////////// -#if 0 -YWidget * YNCursesUI::createEmpty( YWidget * parent ) -{ - ONCREATE; - return new NCEmpty( parent ); -} - - -YWidget * YNCursesUI::createSpacing( YWidget * parent, - YUIDimension dim, - bool stretchable, - YLayoutSize_t layoutUnits ) -{ - ONCREATE; - return new NCSpacing( parent, dim, stretchable, layoutUnits ); -} - -YWidget * YNCursesUI::createLabel( YWidget * parent, const string & text, - bool isHeading, bool isOutputField ) -{ - ONCREATE; - return new NCLabel( parent, text, isHeading, isOutputField ); -} - -#endif YWidget * YNCursesUI::createLogView( YWidget * parent, YWidgetOpt & opt, const YCPString & label, @@ -429,14 +354,6 @@ return new NCLogView( parent, opt, label, visibleLines, maxLines ); } -#if 0 -YWidget * YNCursesUI::createPushButton( YWidget * parent, - const string & label ) -{ - ONCREATE; - return new NCPushButton( parent, label ); -} -#endif YWidget * YNCursesUI::createMenuButton( YWidget * parent, YWidgetOpt & opt, const YCPString & label ) @@ -445,59 +362,6 @@ return new NCMenuButton( parent, opt, label ); } -#if 0 -YWidget * YNCursesUI::createRadioButton( YWidget * parent, - const string & label ) -{ - ONCREATE; - return new NCRadioButton( parent, label ); -} - -YWidget * YNCursesUI::createCheckBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - bool checked ) -{ - ONCREATE; - return new NCCheckBox( parent, opt, label, checked ); -} - -YWidget * YNCursesUI::createInputField( YWidget * parent, - const string & label, - bool passwordMode ) -{ - ONCREATE; - return new NCInputField( parent, label, passwordMode ); -} - -YWidget * YNCursesUI::createSelectionBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ) -{ - ONCREATE; - return new NCSelectionBox( parent, opt, label ); -} - -YWidget * YNCursesUI::createMultiSelectionBox( YWidget *parent, YWidgetOpt & opt, - const YCPString & label ) -{ - ONCREATE; - return new NCMultiSelectionBox( parent, opt, label ); -} - -YWidget * YNCursesUI::createComboBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ) -{ - ONCREATE; - return new NCComboBox( parent, opt, label ); -} - - -YWidget * YNCursesUI::createTree( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ) -{ - ONCREATE; - return new NCTree( parent, opt, label ); -} -#endif YWidget * YNCursesUI::createTable( YWidget * parent, YWidgetOpt & opt, vector<string> header ) @@ -507,16 +371,6 @@ return new NCTable( parent, opt, header, true ); } -#if 0 -YWidget * YNCursesUI::createProgressBar( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - const YCPInteger & maxprogress, - const YCPInteger & progress ) -{ - ONCREATE; - return new NCProgressBar( parent, opt, label, maxprogress, progress ); -} -#endif YWidget * YNCursesUI::createIntField( YWidget * parent, YWidgetOpt & opt, const YCPString & label, @@ -559,56 +413,6 @@ return plugin; } -#if 0 -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : YNCursesUI::createPackageSelector -// METHOD TYPE : YWidget -// -// DESCRIPTION : Calls NCPackageSelectorPlugin::createPackageSelector -// -YWidget * YNCursesUI::createPackageSelector( YWidget * parent, - YWidgetOpt & opt, - const YCPString & floppyDevice ) -{ - ONCREATE; - YWidget * w = 0; - - NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); - - if ( plugin ) - { - w = plugin->createPackageSelector( parent, opt ); - } - - return w; -} - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : YNCursesUI::createPkgSpecial -// METHOD TYPE : YWidget -// -// DESCRIPTION : creates special widgets used for the package selection -// dialog (which do not have a corresponding widget in qt-ui) -// -YWidget * YNCursesUI::createPkgSpecial( YWidget *parent, YWidgetOpt &opt, const YCPString &subwidget ) -{ - ONCREATE; - YWidget * w = 0; - - NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); - - if ( plugin ) - { - w = plugin->createPkgSpecial( parent, opt, subwidget ); - } - - return w; -} -#endif /////////////////////////////////////////////////////////////////// // Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h Thu Sep 27 16:26:58 2007 @@ -136,77 +136,6 @@ */ virtual void closeDialog( YDialog * dialog ); - // - // Widget creation functions - container widgets - // -#if 0 - /** - * Creates a split - */ - virtual YLayoutBox * createSplit( YWidget * parent, YWidgetOpt & opt, - YUIDimension dimension ); - - /** - * Creates a replace point. - */ - virtual YSingleChildContainerWidget * createReplacePoint( YWidget * parent ); - - /** - * Creates an alignment widget - */ - virtual YSingleChildContainerWidget * createAlignment( YWidget * parent, - YAlignmentType halign, - YAlignmentType valign); - - /** - * Creates a squash widget - */ - virtual YSingleChildContainerWidget * createSquash( YWidget * parent, - bool hsquash, - bool vsquash ); - - /** - * Creates a radio button group. - */ - // virtual YContainerWidget * createRadioButtonGroup( YWidget * parent, YWidgetOpt & opt ); - - /** - * Creates a frame widget - */ - virtual YSingleChildContainerWidget * createFrame( YWidget * parent, - const string & label ); - - virtual YSingleChildContainerWidget * createCheckBoxFrame( YWidget * parent, - const string & label, - bool checked ); - // - // Widget creation functions - leaf widgets - // - - /** - * Creates an empty widget - */ - virtual YWidget * createEmpty( YWidget * parent ); - - /** - * Creates a spacing widget - */ - virtual YWidget * createSpacing( YWidget * parent, - YUIDimension dim, - bool stretchable, - YLayoutSize_t layoutUnits ); - - /** - * Creates a label. - * @param text Initial text of the label - * @param heading true if the label is a Heading() - * @param output_field true if the label should look like an output field (3D look) - */ - virtual YWidget * createLabel( YWidget * parent, const string & text, - bool isHeading, bool isOutputField ); - -#endif - /** * Creates a log view widget * @param label label above the log view @@ -217,15 +146,6 @@ const YCPString & label, int visibleLines, int maxLines ); -#if 0 - /** - * Creates a push button. - * @param label Label of the button - * @param default_button true if the button should be the dialogs default button - */ - virtual YWidget * createPushButton( YWidget * parent, - const string & label ); -#endif /** * Creates a menu button. @@ -234,86 +154,12 @@ virtual YWidget * createMenuButton( YWidget * parent, YWidgetOpt & opt, const YCPString & label ); -#if 0 - /** - * Creates a radio button and inserts it into a radio button group - * @param label Label of the radio button - * @param rbg the radio button group the new button will belong to - */ - virtual YWidget * createRadioButton( YWidget * parent, - const string & label ); - - /** - * Creates a check box - * @param label Label of the checkbox - * @param true if it is checked - */ - virtual YWidget * createCheckBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - bool checked ); - - /** - * Creates a text entry or password entry field. - */ - virtual YWidget * createInputField( YWidget * parent, - const string & label, - bool passwordMode ); - - /** - * Creates a selection box - */ - virtual YWidget * createSelectionBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ); - - /** - * Creates a multi selection box - */ - virtual YWidget * createMultiSelectionBox( YWidget *parent, YWidgetOpt & opt, - const YCPString & label ); - - /** - * Creates a combo box - */ - virtual YWidget * createComboBox( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ); - - /** - * Creates a tree - */ - virtual YWidget * createTree( YWidget * parent, YWidgetOpt & opt, - const YCPString & label ); -#endif - /** * Creates a table widget */ virtual YWidget * createTable( YWidget * parent, YWidgetOpt & opt, vector<string> header ); -#if 0 - /** - * Creates a progress bar - */ - virtual YWidget * createProgressBar( YWidget * parent, YWidgetOpt & opt, - const YCPString & label, - const YCPInteger & maxprogress, - const YCPInteger & progress); - - /** - * Creates an image widget from a YCP byteblock - */ - virtual YWidget * createImage( YWidget * parent, YWidgetOpt & opt, - YCPByteblock imagedata, - YCPString defaulttext); - - /** - * Creates an image widget from a YCP byteblock - */ - virtual YWidget * createImage( YWidget * parent, YWidgetOpt & opt, - YCPString filename, - YCPString defaulttext); - -#endif /** * Creates an IntField widget. */ @@ -321,21 +167,6 @@ const YCPString & label, int minValue, int maxValue, int initialValue ); -#if 0 - /** - * Creates the PackageSelector widget (i.e. a widget tree). - */ - virtual YWidget * createPackageSelector( YWidget *parent, - YWidgetOpt &opt, - const YCPString & floppyDevice ); - /** - * Creates a special subwidget used for Package Selection (which doesn't exist in QT-UI). - */ - virtual YWidget * createPkgSpecial( YWidget *parent, - YWidgetOpt &opt, - const YCPString &subwidget ); - -#endif /** * Fills the PackageSelector 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] r41148 - in /trunk/packager: package/yast2-packager.changes src/include/checkmedia/ui.ycp
by lslezak＠svn.opensuse.org 27 Sep '07

27 Sep '07

Author: lslezak Date: Thu Sep 27 16:24:56 2007 New Revision: 41148 URL: http://svn.opensuse.org/viewcvs/yast?rev=41148&view=rev Log: - fixed a wrong wording in the mediacheck help text (#304677) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/include/checkmedia/ui.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Sep 27 16:24:56 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 27 16:20:59 CEST 2007 - lslezak(a)suse.cz + +- fixed a wrong wording in the mediacheck help text (#304677) + +------------------------------------------------------------------- Mon Sep 24 13:49:41 CEST 2007 - lslezak(a)suse.cz - relese the source after it is added, allow changing the CD medium Modified: trunk/packager/src/include/checkmedia/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/checkmedia/… ============================================================================== --- trunk/packager/src/include/checkmedia/ui.ycp (original) +++ trunk/packager/src/include/checkmedia/ui.ycp Thu Sep 27 16:24:56 2007 @@ -252,7 +252,7 @@ // help text - media check 2/7 _("<P>When you have a problem with the installation and are using a CD or DVD installation medium, you should check -whether the medium is be broken.</P> +whether the medium is broken.</P> ") + // help text - media check 3/7 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0