From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sat, 13 Sep 2003 12:01:11 +0000 (+0000)
Subject: use SYMROOT instead of DERIVED_SOURCES_DIR
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7218d34b0ad4556b965fc2f64959deb310203eec

use SYMROOT instead of DERIVED_SOURCES_DIR
simplified warning messages by displaying relative paths instead of full paths


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/distrib/mac/pbsetup-sh b/distrib/mac/pbsetup-sh
index e81926e4de..c7477c8a42 100755
--- a/distrib/mac/pbsetup-sh
+++ b/distrib/mac/pbsetup-sh
@@ -10,12 +10,12 @@
 #-- Licence:     wxWindows licence
 #-----------------------------------------------------------------------------
 #
-# Usage: $0 SRCROOT DERIVED_SOURCES_DIR
+# Usage: $0 SRCROOT SYMROOT
 #
 # Display errors/warnings in the correct format for ProjectBuilder parsing
 #
 if [ $# -ne 2 ] ; then
-    echo "${0}:${LINENO}: error: Usage: ${0} SRCROOT DERIVED_SOURCES_DIR"
+    echo "${0}:${LINENO}: error: Usage: ${0} SRCROOT SYMROOT"
     exit 1
 fi
 #
@@ -33,8 +33,8 @@ fi
 #   preserve user modifications made to setup.h
 #
 if [ ! -f "${1}/../include/wx/mac/setup.h" ]; then
-    echo "${0}:${LINENO}: warning: copying \"${1}/../include/wx/mac/setup0.h\" to \"${1}/../include/wx/mac/setup.h\""
-    echo "${0}:${LINENO}: warning: edit \"${1}/../include/wx/mac/setup.h\" to choose the features you would like to compile wxWindows with[out]"
+    echo "${0}:${LINENO}: warning: copying \"include/wx/mac/setup0.h\" to \"include/wx/mac/setup.h\""
+    echo "${0}:${LINENO}: warning: edit \"include/wx/mac/setup.h\" to choose the features you would like to compile wxWindows with[out]"
     cp "${1}/../include/wx/mac/setup0.h" "${1}/../include/wx/mac/setup.h"
     if [ ! -f "${1}/../include/wx/mac/setup.h" ]; then
         echo "${0}:${LINENO}: error: unable to create setup file \"${1}/../include/wx/mac/setup.h\""
@@ -45,8 +45,8 @@ fi
 # Check that stock setup0.h is not newer than user setup.h
 #
 if [ "${1}/../include/wx/mac/setup0.h" -nt "${1}/../include/wx/mac/setup.h" ] ; then
-    echo "${0}:${LINENO}: warning: \"${1}/../include/wx/mac/setup0.h\" is more recent than \"${1}/../include/wx/mac/setup.h\""
-    echo "${0}:${LINENO}: warning: edit or replace \"${1}/../include/wx/mac/setup.h\" to integrate changes"
+    echo "${0}:${LINENO}: warning: \"include/wx/mac/setup0.h\" is more recent than \"include/wx/mac/setup.h\""
+    echo "${0}:${LINENO}: warning: edit or replace \"include/wx/mac/setup.h\" to integrate changes"
 fi
 #
 # Copy setup.h to setup.h if setup.h doesn't exist