[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/win/tools
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2005-04-13 11:07:07
Message-ID: 20050413110707.DB42D492 () office ! kde ! org
[Download RAW message or body]

CVS commit by staniek: 


-more verbosity added
-environment checks added
-missing headers are copied to win/msvc/


  A            .check_kde_env   1.1
  A            .copy_missing_headers   1.1
  M +14 -1     build_kdelibs_dbg   1.4
  M +22 -1     build_kdelibs_rel   1.2
  M +5 -5      collect_kdelibs_pro_files   1.3
  M +2 -2      kde_env   1.4
  M +1 -2      kde_env_custom.template   1.3
  M +1 -1      update_kdelibs_pro_files   1.4


--- kdelibs/win/tools/build_kdelibs_dbg  #1.3:1.4
@@ -9,4 +9,17 @@
 update_kdelibs_pro_files || exit 1
 
+cd "$KDELIBS"
+
+echo "-------------------------------------------------"
+echo "Building Debug Version of KDElibs/win32"
+echo "Source directory: \$KDELIBS = $KDELIBS"
+echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
+echo "Destination directory: \$KDEDIR = $KDEDIR"
+if [ -n $noclean ] ; then
+        echo "Options: noclean"
+fi
+echo "-------------------------------------------------"
+echo
+
 pwd=`pwd`
 make='nmake -nologo'
@@ -14,5 +27,5 @@
 # special
 cd win/9x && $make || exit 1
-cd $pwd
+cd "$pwd"
 
 # all

--- kdelibs/win/tools/build_kdelibs_rel  #1.1:1.2
@@ -3,6 +3,23 @@
 # (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl
 
+if [ "$1" == "noclean" ] ; then
+        noclean=1
+fi
+
 update_kdelibs_pro_files || exit 1
 
+cd "$KDELIBS"
+
+echo "-------------------------------------------------"
+echo "Building Release Version of KDElibs/win32"
+echo "Source directory: \$KDELIBS = $KDELIBS"
+echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
+echo "Destination directory: \$KDEDIR = $KDEDIR"
+if [ -n $noclean ] ; then
+        echo "Options: noclean"
+fi
+echo "-------------------------------------------------"
+echo
+
 pwd=`pwd`
 
@@ -36,5 +53,9 @@
  ; do 
         echo ================== $d =================
-        cd $d && mkrel  || exit 1
+        cd $d || exit 1
+        if [ -z $noclean ] ; then
+                $make clean || exit 1
+        fi
+        mkrel || exit 1
         cd $pwd
 done

--- kdelibs/win/tools/collect_kdelibs_pro_files  #1.2:1.3
@@ -8,13 +8,13 @@
 mkdir -p $dest
 
-[ -z "$KDELIBS" ] && echo "KDELIBS?" && exit 1
+.check_kde_env || exit 1
 
-cd $KDELIBS
+cd "$KDELIBS"
 
 for pro in `find . -name \*.pro | grep -v "\/\.\|^\.\/win/"` ; do
-        dir=`dirname $pro`
-        mkdir -p $dest/$dir
+        dir=`dirname "$pro"`
+        mkdir -p "$dest/$dir"
         if [ "$pro" -nt "$dest/$pro" ] ; then
-                cp -p "$pro" $dest/$pro
+                cp -p "$pro" "$dest/$pro"
                 echo "$pro"
         fi

--- kdelibs/win/tools/kde_env  #1.3:1.4
@@ -6,8 +6,8 @@
 # Copy kde_env_custom.template to kde_env_custom and this it's paths if needed:
 
-source "kde_env_custom"
+source "kde_env_custom" || exit 1
 
 # Generic settings
-export KDELIBS=$KDEWIN\\kdelibs
+export KDELIBS=$KDEWIN\\kdelibs  # KDElibs/win32 source directory
 export INCLUDE="$KDEWIN\\include;$KDELIBS;$KDELIBS\\kdecore;$KDELIBS\\kdefx;$KDELIBS\ \
\kdeprint;$KDELIBS\\kdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE"
  

--- kdelibs/win/tools/kde_env_custom.template  #1.2:1.3
@@ -3,5 +3,4 @@
 # Copy this file as kde_env_custom and alter it
 
-
 if [ -z "$MSVC" ] ; then
 
@@ -15,5 +14,5 @@
 export KDEDIR="c:\\kde"
 
-# KDElibs/win32 source directory, please change
+# KDElibs/win32 top source directory, please change
 KDEWIN="c:\\kdewin32"
 

--- kdelibs/win/tools/update_kdelibs_pro_files  #1.3:1.4
@@ -6,5 +6,5 @@
 # (c) 2005, Jaroslaw Staniek, js@iidea.pl
 
-[ -z "$KDELIBS" ] && echo "$0: \$KDELIBS environment variable is not set. Set it to \
absolute path of kdelibs/win32 source code, e.g. C:\\kdelibs" && exit 1 \
+.check_kde_env || exit 1  
 src=win/pro_files


[prev in list] [next in list] [prev in thread] [next in thread]