Mailinglist Archive: zypp-commit (223 mails)

< Previous Next >
[zypp-commit] r10538 - in /trunk/zypper/src: ./ callbacks/ output/ utils/
  • From: jkupec@xxxxxxxxxxxxxxxx
  • Date: Fri, 11 Jul 2008 12:17:16 -0000
  • Message-id: <20080711121717.3214324B21@xxxxxxxxxxxxxxxx>
Author: jkupec
Date: Fri Jul 11 14:17:16 2008
New Revision: 10538

URL: http://svn.opensuse.org/viewcvs/zypp?rev=10538&view=rev
Log:
- fixed include paths
- moved getopt.* and prompt.* to utils/

Added:
trunk/zypper/src/utils/getopt.cc
- copied unchanged from r10533, trunk/zypper/src/getopt.cc
trunk/zypper/src/utils/getopt.h
- copied unchanged from r10533, trunk/zypper/src/getopt.h
trunk/zypper/src/utils/prompt.cc
- copied unchanged from r10533, trunk/zypper/src/prompt.cc
trunk/zypper/src/utils/prompt.h
- copied unchanged from r10533, trunk/zypper/src/prompt.h
Removed:
trunk/zypper/src/getopt.cc
trunk/zypper/src/getopt.h
trunk/zypper/src/prompt.cc
trunk/zypper/src/prompt.h
Modified:
trunk/zypper/src/CMakeLists.txt
trunk/zypper/src/Zypper.cc
trunk/zypper/src/Zypper.h
trunk/zypper/src/callbacks/keyring.h
trunk/zypper/src/callbacks/locks.h
trunk/zypper/src/callbacks/media.h
trunk/zypper/src/callbacks/repo.h
trunk/zypper/src/callbacks/rpm.h
trunk/zypper/src/misc.cc
trunk/zypper/src/output/Out.h
trunk/zypper/src/solve-commit.cc

Modified: trunk/zypper/src/CMakeLists.txt
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/CMakeLists.txt?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/CMakeLists.txt (original)
+++ trunk/zypper/src/CMakeLists.txt Fri Jul 11 14:17:16 2008
@@ -5,17 +5,17 @@

MESSAGE ( "** Locale dir is ${INSTALL_PREFIX}/share/locale" )

+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
+
SET (zypper_HEADERS
Zypper.h
main.h
Command.h
- getopt.h
repos.h
misc.h
utils.h
search.h
info.h
- prompt.h
richtext.h
Table.h
locks.h
@@ -32,14 +32,12 @@
Zypper.cc
main.cc
Command.cc
- getopt.cc
repos.cc
misc.cc
utils.cc
search.cc
info.cc
Table.cc
- prompt.cc
richtext.cc
locks.cc
install.cc
@@ -64,11 +62,15 @@
)

SET( zypper_utils_HEADERS
+ utils/getopt.h
utils/pager.h
+ utils/prompt.h
)

SET( zypper_utils_SRCS
+ utils/getopt.cc
utils/pager.cc
+ utils/prompt.cc
${zypper_utils_HEADERS}
)


Modified: trunk/zypper/src/Zypper.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/Zypper.cc (original)
+++ trunk/zypper/src/Zypper.cc Fri Jul 11 14:17:16 2008
@@ -39,7 +39,7 @@

#include "Table.h"
#include "utils.h"
-#include "getopt.h"
+#include "utils/getopt.h"

#include "repos.h"
#include "install.h"

Modified: trunk/zypper/src/Zypper.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.h?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/Zypper.h (original)
+++ trunk/zypper/src/Zypper.h Fri Jul 11 14:17:16 2008
@@ -13,9 +13,9 @@
#include "zypp/RepoManager.h" // for RepoManagerOptions
#include "zypp/SrcPackage.h"

-#include "output/Out.h"
#include "Command.h"
-#include "getopt.h"
+#include "utils/getopt.h"
+#include "output/Out.h"

/** directory for storing manually installed (zypper install foo.rpm) RPM files
*/

Modified: trunk/zypper/src/callbacks/keyring.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/keyring.h?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/callbacks/keyring.h (original)
+++ trunk/zypper/src/callbacks/keyring.h Fri Jul 11 14:17:16 2008
@@ -1,11 +1,9 @@
-/*---------------------------------------------------------------------\
-| ____ _ __ __ ___ |
-| |__ / \ / / . \ . \ |
-| / / \ V /| _/ _/ |
-| / /__ | | | | | | |
-| /_____||_| |_| |_| |
-| |
-\---------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+ ____ _ _ __ _ __ ___ _ _
+ |_ / || | '_ \ '_ \/ -_) '_|
+ /__|\_, | .__/ .__/\___|_|
+ |__/|_| |_|
+\*---------------------------------------------------------------------------*/

#ifndef ZMART_KEYRINGCALLBACKS_H
#define ZMART_KEYRINGCALLBACKS_H
@@ -20,7 +18,7 @@
#include "zypp/KeyRing.h"
#include "zypp/Digest.h"

-#include "../prompt.h"
+#include "utils/prompt.h"

///////////////////////////////////////////////////////////////////
namespace zypp {

Modified: trunk/zypper/src/callbacks/locks.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/locks.h?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/callbacks/locks.h (original)
+++ trunk/zypper/src/callbacks/locks.h Fri Jul 11 14:17:16 2008
@@ -1,3 +1,10 @@
+/*---------------------------------------------------------------------------*\
+ ____ _ _ __ _ __ ___ _ _
+ |_ / || | '_ \ '_ \/ -_) '_|
+ /__|\_, | .__/ .__/\___|_|
+ |__/|_| |_|
+\*---------------------------------------------------------------------------*/
+
#ifndef LOCKS_ZYPPER_CALLBACKS_H
#define LOCKS_ZYPPER_CALLBACKS_H

@@ -7,9 +14,8 @@
#include "zypp/ZYppCallbacks.h"
#include "zypp/PoolQuery.h"

-#include "../prompt.h"
-#include "../utils.h"
-#include "../output/prompt.h"
+#include "utils/prompt.h"
+#include "utils.h"

namespace zypp {


Modified: trunk/zypper/src/callbacks/media.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/media.h?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/callbacks/media.h (original)
+++ trunk/zypper/src/callbacks/media.h Fri Jul 11 14:17:16 2008
@@ -1,11 +1,9 @@
-/*---------------------------------------------------------------------\
-| ____ _ __ __ ___ |
-| |__ / \ / / . \ . \ |
-| / / \ V /| _/ _/ |
-| / /__ | | | | | | |
-| /_____||_| |_| |_| |
-| |
-\---------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+ ____ _ _ __ _ __ ___ _ _
+ |_ / || | '_ \ '_ \/ -_) '_|
+ /__|\_, | .__/ .__/\___|_|
+ |__/|_| |_|
+\*---------------------------------------------------------------------------*/

#ifndef ZMART_MEDIA_CALLBACKS_H
#define ZMART_MEDIA_CALLBACKS_H
@@ -20,9 +18,8 @@
#include "zypp/Url.h"
#include "zypp/media/MediaUserAuth.h"

-#include "../Zypper.h"
-#include "../prompt.h"
-#include "../output/prompt.h"
+#include "Zypper.h"
+#include "utils/prompt.h"

#define REPEAT_LIMIT 3


Modified: trunk/zypper/src/callbacks/repo.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/repo.h?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/callbacks/repo.h (original)
+++ trunk/zypper/src/callbacks/repo.h Fri Jul 11 14:17:16 2008
@@ -1,11 +1,9 @@
-/*---------------------------------------------------------------------\
-| ____ _ __ __ ___ |
-| |__ / \ / / . \ . \ |
-| / / \ V /| _/ _/ |
-| / /__ | | | | | | |
-| /_____||_| |_| |_| |
-| |
-\---------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+ ____ _ _ __ _ __ ___ _ _
+ |_ / || | '_ \ '_ \/ -_) '_|
+ /__|\_, | .__/ .__/\___|_|
+ |__/|_| |_|
+\*---------------------------------------------------------------------------*/

#ifndef ZMART_SOURCE_CALLBACKS_H
#define ZMART_SOURCE_CALLBACKS_H
@@ -18,9 +16,9 @@
#include "zypp/Pathname.h"
#include "zypp/Url.h"

-#include "../Zypper.h"
-#include "../prompt.h"
-#include "../utils.h"
+#include "Zypper.h"
+#include "utils/prompt.h"
+#include "utils.h"

///////////////////////////////////////////////////////////////////
namespace ZmartRecipients

Modified: trunk/zypper/src/callbacks/rpm.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/callbacks/rpm.h?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/callbacks/rpm.h (original)
+++ trunk/zypper/src/callbacks/rpm.h Fri Jul 11 14:17:16 2008
@@ -1,11 +1,9 @@
-/*---------------------------------------------------------------------\
-| ____ _ __ __ ___ |
-| |__ / \ / / . \ . \ |
-| / / \ V /| _/ _/ |
-| / /__ | | | | | | |
-| /_____||_| |_| |_| |
-| |
-\---------------------------------------------------------------------*/
+/*---------------------------------------------------------------------------*\
+ ____ _ _ __ _ __ ___ _ _
+ |_ / || | '_ \ '_ \/ -_) '_|
+ /__|\_, | .__/ .__/\___|_|
+ |__/|_| |_|
+\*---------------------------------------------------------------------------*/

#ifndef ZMART_RPM_CALLBACKS_H
#define ZMART_RPM_CALLBACKS_H
@@ -21,8 +19,8 @@
#include "zypp/Package.h"
#include "zypp/Patch.h"

-#include "../Zypper.h"
-#include "../prompt.h"
+#include "Zypper.h"
+#include "output/prompt.h"


static bool report_again(timespec * last)

Modified: trunk/zypper/src/misc.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/misc.cc?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/misc.cc (original)
+++ trunk/zypper/src/misc.cc Fri Jul 11 14:17:16 2008
@@ -20,10 +20,10 @@
#include "utils.h"
#include "getopt.h"
#include "richtext.h"
-#include "prompt.h"

#include "misc.h"
#include "utils/pager.h"
+#include "utils/prompt.h"

using namespace std;
using namespace zypp;

Modified: trunk/zypper/src/output/Out.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/Out.h?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/output/Out.h (original)
+++ trunk/zypper/src/output/Out.h Fri Jul 11 14:17:16 2008
@@ -7,8 +7,9 @@
#include "zypp/base/Exception.h"
#include "zypp/Url.h"

-#include "../prompt.h"
-#include "prompt.h"
+#include "utils/prompt.h"
+
+#include "output/prompt.h"

/**
* Base class for producing common (for now) zypper output.

Modified: trunk/zypper/src/solve-commit.cc
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/solve-commit.cc?rev=10538&r1=10537&r2=10538&view=diff
==============================================================================
--- trunk/zypper/src/solve-commit.cc (original)
+++ trunk/zypper/src/solve-commit.cc Fri Jul 11 14:17:16 2008
@@ -20,9 +20,9 @@
#include "zypp/media/MediaException.h"

#include "misc.h"
-#include "prompt.h"
#include "utils.h"
-#include "getopt.h"
+#include "utils/getopt.h"
+#include "utils/prompt.h"

#include "solve-commit.h"


--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages