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

List:       kde-commits
Subject:    kdesupport/emerge
From:       Ralf Habacker <ralf.habacker () freenet ! de>
Date:       2011-02-15 1:32:27
Message-ID: 20110215013227.33B64AC8BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1220754 by habacker:

moved short path settings into kdeenv.bat and added version number to \
kdesettings.bat. This enables kdeenv.bat to use older setting files with incompatible \
changes. which will be the case when updating emerge from svn

 M  +43 -0     kdeenv.bat  
 M  +5 -34     kdesettings-example.bat  


--- trunk/kdesupport/emerge/kdeenv.bat #1220753:1220754
@@ -68,6 +68,49 @@
 call %~dp0etc\kdesettings.bat %BUILDTYPE%
 )
 
+rem handle drive substitution
+rem 
+rem check for unversioned kdesettings.bat,
+rem in that case drive substition already took place
+if NOT "%EMERGE_SETTINGS_VERSION%" == "" (
+    if %EMERGE_USE_SHORT_PATH% == 1 (
+        if NOT "%EMERGE_ROOT_DRIVE%" == "" (
+            subst %EMERGE_ROOT_DRIVE% /D 2>NUL
+            subst %EMERGE_ROOT_DRIVE% %KDEROOT%
+            set KDEROOT=%EMERGE_ROOT_DRIVE%\
+        )
+        if NOT "%EMERGE_SVN_DRIVE%" == "" (
+            subst %EMERGE_SVN_DRIVE% /D 2>NUL
+            mkdir %KDESVNDIR% 2>NUL
+            subst %EMERGE_SVN_DRIVE% %KDESVNDIR%
+            set KDESVNDIR=%EMERGE_SVN_DRIVE%\
+        )
+        if NOT "%EMERGE_GIT_DRIVE%" == "" (
+            subst %EMERGE_GIT_DRIVE% /D 2>NUL
+            mkdir %KDEGITDIR% 2>NUL
+            subst %EMERGE_GIT_DRIVE% %KDEGITDIR%
+            set KDEGITDIR=%EMERGE_GIT_DRIVE%\
+        )
+        if NOT "%EMERGE_DOWNLOAD_DRIVE%" == "" (
+            subst %EMERGE_DOWNLOAD_DRIVE% /D 2>NUL
+            mkdir %DOWNLOADDIR% 2>NUL
+            subst %EMERGE_DOWNLOAD_DRIVE% %DOWNLOADDIR%
+            set DOWNLOADDIR=%EMERGE_DOWNLOAD_DRIVE%\
+        )
+        %EMERGE_ROOT_DRIVE%
+    )
+)
+rem print pathes 
+if NOT "%EMERGE_SETTINGS_VERSION%" == "" (
+    echo KDEROOT     : %KDEROOT%
+    echo KDECOMPILER : %KDECOMPILER%
+    echo KDESVNDIR   : %KDESVNDIR%
+    echo KDEGITDIR   : %KDEGITDIR%
+    echo PYTHONPATH  : %PYTHONPATH%
+    echo DOWNLOADDIR : %DOWNLOADDIR%
+)
+
+rem handle multiple merge roots
 set SUBDIR=
 if "%BUILDTYPE%" == "" (
     if "%EMERGE_MERGE_ROOT_WITH_BUILD_TYPE%" == "True" (
--- trunk/kdesupport/emerge/kdesettings-example.bat #1220753:1220754
@@ -261,39 +261,10 @@
 rem No editing should be necessary below this line (in an ideal world)
 rem ##################################################################
 
-rem handle drive substitution
-if %EMERGE_USE_SHORT_PATH% == 1 (
-    if NOT "%EMERGE_ROOT_DRIVE%" == "" (
-        subst %EMERGE_ROOT_DRIVE% /D
-        subst %EMERGE_ROOT_DRIVE% %KDEROOT%
-        set KDEROOT=%EMERGE_ROOT_DRIVE%\
-    )
-    if NOT "%EMERGE_SVN_DRIVE%" == "" (
-        subst %EMERGE_SVN_DRIVE% /D
-        mkdir %KDESVNDIR% 2>NUL
-        subst %EMERGE_SVN_DRIVE% %KDESVNDIR%
-        set KDESVNDIR=%EMERGE_SVN_DRIVE%\
-    )
-    if NOT "%EMERGE_GIT_DRIVE%" == "" (
-        subst %EMERGE_GIT_DRIVE% /D
-        mkdir %KDEGITDIR% 2>NUL
-        subst %EMERGE_GIT_DRIVE% %KDEGITDIR%
-        set KDEGITDIR=%EMERGE_GIT_DRIVE%\
-    )
-    if NOT "%EMERGE_DOWNLOAD_DRIVE%" == "" (
-        subst %EMERGE_DOWNLOAD_DRIVE% /D
-        mkdir %DOWNLOADDIR% 2>NUL
-        subst %EMERGE_DOWNLOAD_DRIVE% %DOWNLOADDIR%
-        set DOWNLOADDIR=%EMERGE_DOWNLOAD_DRIVE%\
-    )
-    %EMERGE_ROOT_DRIVE%
-)
+rem internal used settings version only for emerge maintainers 
+rem increment for each definition change in this file and fix version 
+rem issues in kdeenv.bat 
+rem Note: unset EMERGE_SETTINGS_VERSION means version 0
+SET EMERGE_SETTINGS_VERSION=1
 
 echo kdesettings.bat executed
-echo KDEROOT     : %KDEROOT%
-echo KDECOMPILER : %KDECOMPILER%
-echo KDESVNDIR   : %KDESVNDIR%
-echo KDEGITDIR   : %KDEGITDIR%
-echo PYTHONPATH  : %PYTHONPATH%
-echo DOWNLOADDIR : %DOWNLOADDIR%
-


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