#1004. Reviewed all include directives in src/*.cpp and samples/*.cpp

fixed svn_version.sh again!
change to test/build-test.py for MacOS-X/Xcode 6.

include/exiv2/exiv2.hpp

@@ -43,6 +43,7 @@
 #include "exif.hpp"
 #include "futils.hpp"
 #include "gifimage.hpp"
+#include "http.hpp"
 #include "image.hpp"
 #include "iptc.hpp"
 #include "jp2image.hpp"
@@ -57,6 +58,7 @@
 #include "psdimage.hpp"
 #include "rafimage.hpp"
 #include "rw2image.hpp"
+#include "ssh.hpp"
 #include "tags.hpp"
 #include "tgaimage.hpp"
 #include "tiffimage.hpp"

include/exiv2/http.hpp

@@ -5,8 +5,6 @@
 #include <map>
 #include <algorithm>
 
-#include "exiv2.hpp"
-
 namespace Exiv2 {
     typedef std::map<std::string,std::string> dict_t;
     typedef dict_t::iterator                  dict_i;

samples/conntest.cpp

@@ -2,16 +2,7 @@
 // con-test.cpp
 // Tester application for testing the http/https/ftp/ssh/sftp connection
 
-#include "config.h"
-
-#include "exiv2/futils.hpp"
-#include "http.hpp"
-#if EXV_USE_CURL == 1
-#include <curl/curl.h>
-#endif
-#if EXV_USE_SSH == 1
-#include "ssh.hpp"
-#endif
+#include <exiv2/exiv2.hpp>
 
 #include <iostream>
 #include <stdlib.h>

samples/httptest.cpp

@@ -4,7 +4,8 @@
  This application is to test http.cpp. It provides the function to GET|HEAD|PUT the file via http protocol.
  */
 
-#include "http.hpp"
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <stdlib.h>
 using namespace std;

samples/metacopy.cpp

@@ -28,15 +28,15 @@
  */
 // *****************************************************************************
 // included header files
-#include "image.hpp"
-#include "iptc.hpp"
-#include "exif.hpp"
-#include "types.hpp"
-#include "metacopy.hpp"
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <fstream>
 #include <cassert>
 
+#include "utils.hpp"
+#include "metacopy.hpp"
+
 // *****************************************************************************
 // Main
 int main(int argc, char* const argv[])

samples/metacopy.hpp

@@ -28,8 +28,6 @@
 #ifndef METACOPY_HPP_
 #define METACOPY_HPP_
 
-#include "utils.hpp"
-
 class Params : public Util::Getopt {
 private:
     std::string optstring_;

samples/path-test.cpp

@@ -1,12 +1,15 @@
 // ***************************************************************** -*- C++ -*-
 // path-test.cpp, $Rev$
 
-#include "utils.hpp"
+#include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <string>
 
+#include "utils.hpp"
+
 int main(int argc, char* const argv[])
 {
     if (argc != 2) {

samples/remotetest.cpp

@@ -5,6 +5,7 @@
 // and reset the metadata back to the original status.
 
 #include <exiv2/exiv2.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <cassert>

samples/tiffaddpath-test.cpp

@@ -2,6 +2,9 @@
 // tiffaddpath-test.cpp, $Rev$
 // Test driver to test adding new tags to a TIFF composite structure
 
+
+#include <exiv2/exiv2.hpp>
+
 #include "tiffcomposite_int.hpp"
 #include "makernote2_int.hpp"
 #include "tiffimage_int.hpp"

samples/werror-test.cpp

@@ -2,9 +2,10 @@
 // werror-test.cpp, $Rev$
 // Simple tests for the wide-string error class WError
 
-#include <iostream>
 #include <exiv2/exiv2.hpp>
 
+#include <iostream>
+
 int main()
 {
     try {

src/Makefile

@@ -84,7 +84,6 @@ CCSRC =  asfvideo.cpp      \
 	 fujimn.cpp            \
 	 gifimage.cpp          \
 	 http.cpp              \
-	 ssh.cpp               \
 	 image.cpp             \
 	 iptc.cpp              \
 	 jp2image.cpp          \
@@ -113,6 +112,7 @@ CCSRC += preview.cpp       \
 	 riffvideo.cpp         \
 	 rw2image.cpp          \
 	 samsungmn.cpp         \
+	 ssh.cpp               \
 	 sigmamn.cpp           \
 	 sonymn.cpp            \
 	 tags.cpp              \
@@ -133,8 +133,9 @@ endif
 
 # Source files for the Exiv2 application
 EXIV2MAIN = exiv2.cpp
-EXIV2SRC  = actions.cpp    \
-	        utils.cpp
+EXIV2SRC  = actions.cpp \
+            utils.cpp
+
 # C source files for the Exiv2 application
 ifndef HAVE_TIMEGM
 EXIVCSRC  = localtime.c

src/http.cpp

@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "http.hpp"
+#include "futils.hpp"
 
 #include <sys/types.h>
 #include <stdio.h>

src/svn_version.sh

@@ -6,12 +6,13 @@
 
 svn_version_h=svn_version.h
 svn_version=$(svn info .. 2>/dev/null)
+s=$?
 
 ##
 # from Jenkins, svn is almost always a disaster because
 # Jenkins SVN Jenkins is 1.7 and the build machine is normally at least 1.8
-if [ $? == 0 ]; then
-	svn_version=$(echo $svn_version | grep ^Revision | cut -f 2 -d' ')
+if [ "$s" == "0" ]; then
+	svn_version=$(svn info .. | grep ^Revision | cut -f 2 -d' ')
     if [ -z "$svn_version"   ]; then svn_version=0 ; fi
 else
 	svn_version=0

src/utils.cpp

@@ -34,8 +34,6 @@ EXIV2_RCSID("@(#) $Id$")
 #include "utils.hpp"
 
 // + standard includes
-#include <sys/types.h>
-#include <sys/stat.h>
 #if defined(_MSC_VER)
 # include "getopt_win32.h"
 # define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
@@ -45,6 +43,8 @@ EXIV2_RCSID("@(#) $Id$")
 # include <unistd.h>                     // for getopt(), stat()
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <climits>
 #include <cerrno>
 #include <cstdlib>

test/build-test.py

@@ -73,12 +73,12 @@ def expect(dict,expects):
 ## 
 def apple(dict):
     expects= [ 'libSystem.B.dylib'
-             , 'libexpat.1.dylib'            
+             , 'libexpat.1.dylib'
              , 'libz.1.dylib'
              , 'libiconv.2.dylib'
-             , 'libstdc++.6.dylib'
              , 'libdyld.dylib'
              , 'libc++.1.dylib'
+             # , 'libstdc++.6.dylib' # I suspect this is only with GCC (Xcode4 and earlier)
              ] ;
 
     # which version of MacOS-X ?