Ignore:
Timestamp:
Nov 28, 2013, 12:52:06 PM (12 years ago)
Author:
Silvan Scherrer
Message:

changed some qt diff's

File:
1 moved

Legend:

Unmodified
Added
Removed

  • diffs/smtube_1.7_GA.diff

    r144 r150  
    1 diff -Naur -x .svn vendor\current/build_os2.cmd trunk/build_os2.cmd
    2 --- vendor\current/build_os2.cmd        1970-01-01 01:00:00.000000000 +0100
    3 +++ trunk/build_os2.cmd 2013-06-05 16:22:26.000000000 +0200
    4 @@ -0,0 +1,272 @@
     1diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/build_os2.cmd E:\trees\smtube\trunk/build_os2.cmd
     2--- E:\trees\smtube\trunk\..\vendor\current/build_os2.cmd       1970-01-01 01:00:00.000000000 +0100
     3+++ E:\trees\smtube\trunk/build_os2.cmd 2013-11-28 12:41:08.000000000 +0100
     4@@ -0,0 +1,288 @@
    55+/* SMTube Build Script */
    66+/* root done by Herwig Bauernfeind, enhanced by Silvan Scherrer */
    … …  
    99+/* version 0.1.0 from 23.05.2013 Silvan (first edition) */
    1010+/* version 0.1.1 from 05.06.2013 Silvan renamed readme files (happy birthday Justin) */
     11+/* version 0.2.0 from 28.11.2013 Silvan added branding, added diff */
    1112+
    1213+/* init the version string (don't forget to change) */
    13 +version = "0.1.1"
    14 +version_date = "05.06.2013"
     14+version = "0.2.0"
     15+version_date = "28.11.2013"
    1516+'@echo off'
    1617+
    … …  
    2526+os2Dir     = sourceDir || '\os2'
    2627+srcDir     = sourceDir || '\src'
     28+vendorDir  = sourceDir || '\..\vendor\current'
     29+diffDir    = sourceDir || '\..\'
    2730+installDir = buildDir || '\install'
    2831+installDirT= installDir || '\translations'
    … …  
    3437+/* get the SMTube version */
    3538+SMTube_version = '0.0.0'
     39+SMTube_build = ''
    3640+call version
    3741+internal_build = translate(SMTube_version, '_', '.')
    … …  
    4044+say title
    4145+say
    42 +say "Build directory:" buildDir
     46+say "Build directory :" buildDir
    4347+say "Source directory:" sourceDir
    4448+say
    45 +say "SMTube version:" SMTube_version
     49+say "SMTube version  :" SMTube_version
     50+say "       build    :" SMTube_build
    4651+say
    4752+
    … …  
    5257+
    5358+if command = "INSTALL" then do
    54 +    SMTube_build = option
     59+    if option \== "" then do
     60+       SMTube_build = option
     61+    end
    5562+    select
    5663+       when SMTube_build \== "" then do
    … …  
    7178+end
    7279+
     80+say "Executing command: "command option
     81+
    7382+select
    7483+    when command = "MAKE" & option = "CLEAN" then do
    75 +        say "Executing command: "command option
    7684+
    7785+        say "cleaning the tree"
    … …  
    8290+    end
    8391+    when command = "MAKE" then do
    84 +        say "Executing command: "command option
    8592+
    8693+        say "building svn_revision"
    … …  
    104111+
    105112+    when command = "INSTALL" then do
    106 +        say "Executing command: "command
    107113+
    108114+/* first delete everything */
    … …  
    150156+
    151157+    when command = "UNINSTALL" then do
    152 +        say "Executing command: "command
    153158+
    154159+       call deleteall
     160+       
     161+    end
     162+
     163+    when command = "DIFF" then do
     164+
     165+       address cmd 'diff -Naur ' || vendorDir || ' ' || sourceDir || ' -x *.qm -x geoip.dat -x conf.pri > ' || diffDir || 'smtube_' || SMTube_version || '_' || SMTube_build || '.diff'
    155166+       
    156167+    end
    … …  
    183194+
    184195+qmake:
    185 +    address cmd 'qmake ' sourceDir ' 2>'qErrorFile' 1>'qOutFile
     196+    address cmd 'qmake ' sourceDir ' "APPLICATION_VERSION='SMTube_version'" 2>'qErrorFile' 1>'qOutFile
    186197+    qRC = RC
    187198+    if qRC <> 0 then do
    … …  
    247258+ *  reads the version.cpp and gets the SMTube version from there
    248259+ */
    249 +version: procedure expose SMTube_version srcDir
     260+version: procedure expose SMTube_version SMTube_build srcDir
    250261+
    251262+    SMTubeVer = ' '
    … …  
    265276+    end
    266277+
     278+    if SMTube_build == '' then do
     279+       SMTube_build = 'GA'
     280+    end
     281+
    267282+    return
    268283+
    … …  
    272287+    say "    make debug"
    273288+    say "    make clean"
    274 +    say "    install version"
     289+    say "    install build (build overwrites what this script finds)"
    275290+    say "    uninstall"
     291+    say "    diff (creates a diff from vendor to trunk)"
    276292+exit 255
    277 diff -Naur -x .svn vendor\current/get_svn_revision.sh trunk/get_svn_revision.sh
    278 --- vendor\current/get_svn_revision.sh  2012-02-24 23:23:26.000000000 +0100
    279 +++ trunk/get_svn_revision.sh   2013-05-23 18:29:44.000000000 +0200
     293diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/get_svn_revision.sh E:\trees\smtube\trunk/get_svn_revision.sh
     294--- E:\trees\smtube\trunk\..\vendor\current/get_svn_revision.sh 2012-02-24 23:23:26.000000000 +0100
     295+++ E:\trees\smtube\trunk/get_svn_revision.sh   2013-05-23 18:29:44.000000000 +0200
    280296@@ -7,10 +7,14 @@
    281297 test "$1" && extra="-$1"
    … …  
    293309 OLD_REVISION=`cat src/svn_revision.h 2> /dev/null`
    294310 
    295 diff -Naur -x .svn vendor\current/os2/smtube_de.txt trunk/os2/smtube_de.txt
    296 --- vendor\current/os2/smtube_de.txt    1970-01-01 01:00:00.000000000 +0100
    297 +++ trunk/os2/smtube_de.txt     2013-05-27 16:30:32.000000000 +0200
     311diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/os2/smtube_de.txt E:\trees\smtube\trunk/os2/smtube_de.txt
     312--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_de.txt   1970-01-01 01:00:00.000000000 +0100
     313+++ E:\trees\smtube\trunk/os2/smtube_de.txt     2013-05-27 16:30:32.000000000 +0200
    298314@@ -0,0 +1,95 @@
    299315+SMTube _VERSION_ _BUILD_ README
    … …  
    392408+  * erste Version
    393409+
    394 diff -Naur -x .svn vendor\current/os2/smtube_en.txt trunk/os2/smtube_en.txt
    395 --- vendor\current/os2/smtube_en.txt    1970-01-01 01:00:00.000000000 +0100
    396 +++ trunk/os2/smtube_en.txt     2013-05-27 16:30:54.000000000 +0200
     410diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/os2/smtube_en.txt E:\trees\smtube\trunk/os2/smtube_en.txt
     411--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_en.txt   1970-01-01 01:00:00.000000000 +0100
     412+++ E:\trees\smtube\trunk/os2/smtube_en.txt     2013-05-27 16:30:54.000000000 +0200
    397413@@ -0,0 +1,94 @@
    398414+SMTube _VERSION_ _BUILD_ README
    … …  
    490506+2013-05-23
    491507+  * first version
    492 diff -Naur -x .svn vendor\current/os2/smtube_fr.txt trunk/os2/smtube_fr.txt
    493 --- vendor\current/os2/smtube_fr.txt    1970-01-01 01:00:00.000000000 +0100
    494 +++ trunk/os2/smtube_fr.txt     2013-05-28 12:53:00.000000000 +0200
     508diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/os2/smtube_fr.txt E:\trees\smtube\trunk/os2/smtube_fr.txt
     509--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_fr.txt   1970-01-01 01:00:00.000000000 +0100
     510+++ E:\trees\smtube\trunk/os2/smtube_fr.txt     2013-05-28 12:53:00.000000000 +0200
    495511@@ -0,0 +1,101 @@
    496512+SMTube _VERSION_ _BUILD_ LISEZMOI
    … …  
    597613+2013-05-23
    598614+  * Version initiale
    599 diff -Naur -x .svn vendor\current/os2/smtube.ico trunk/os2/smtube.ico
    600 --- vendor\current/os2/smtube.ico       1970-01-01 01:00:00.000000000 +0100
    601 +++ trunk/os2/smtube.ico        2013-05-23 19:53:18.000000000 +0200
     615diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/os2/smtube.ico E:\trees\smtube\trunk/os2/smtube.ico
     616--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube.ico      1970-01-01 01:00:00.000000000 +0100
     617+++ E:\trees\smtube\trunk/os2/smtube.ico        2013-05-23 19:53:18.000000000 +0200
    602618@@ -0,0 +1,62 @@
    603619+CI :
    … …  
    11171133
    11181134\ No newline at end of file
    1119 diff -Naur -x .svn vendor\current/smtube.pro trunk/smtube.pro
    1120 --- vendor\current/smtube.pro   1970-01-01 01:00:00.000000000 +0100
    1121 +++ trunk/smtube.pro    2013-05-23 18:30:40.000000000 +0200
     1135diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/smtube.pro E:\trees\smtube\trunk/smtube.pro
     1136--- E:\trees\smtube\trunk\..\vendor\current/smtube.pro  1970-01-01 01:00:00.000000000 +0100
     1137+++ E:\trees\smtube\trunk/smtube.pro    2013-05-23 18:30:40.000000000 +0200
    11221138@@ -0,0 +1,5 @@
    11231139+TEMPLATE = subdirs
    … …  
    11271143+src.file=src/smtube.pro
    11281144\ No newline at end of file
    1129 diff -Naur -x .svn vendor\current/src/main.cpp trunk/src/main.cpp
    1130 --- vendor\current/src/main.cpp 2013-01-12 01:03:30.000000000 +0100
    1131 +++ trunk/src/main.cpp  2013-05-23 19:40:56.000000000 +0200
     1145diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/src/main.cpp E:\trees\smtube\trunk/src/main.cpp
     1146--- E:\trees\smtube\trunk\..\vendor\current/src/main.cpp        2013-01-12 01:03:30.000000000 +0100
     1147+++ E:\trees\smtube\trunk/src/main.cpp  2013-05-23 19:40:56.000000000 +0200
    11321148@@ -43,7 +43,7 @@
    11331149 }
    … …  
    11391155 #ifdef TRANSLATION_PATH
    11401156         QString s = QString(TRANSLATION_PATH);
    1141 diff -Naur -x .svn vendor\current/src/players.cpp trunk/src/players.cpp
    1142 --- vendor\current/src/players.cpp      2013-01-12 01:03:30.000000000 +0100
    1143 +++ trunk/src/players.cpp       2013-05-23 18:40:32.000000000 +0200
     1157diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/src/players.cpp E:\trees\smtube\trunk/src/players.cpp
     1158--- E:\trees\smtube\trunk\..\vendor\current/src/players.cpp     2013-01-12 01:03:30.000000000 +0100
     1159+++ E:\trees\smtube\trunk/src/players.cpp       2013-05-23 18:40:32.000000000 +0200
    11441160@@ -25,11 +25,11 @@
    11451161        if (found) *found = true;
    … …  
    11561172        if (!fi.exists() || !fi.isExecutable() || fi.isDir()) {
    11571173                qDebug("Player::exec: command: '%s' is not a valid executable", bin.toUtf8().constData());
    1158 diff -Naur -x .svn vendor\current/src/qtsingleapplication/qtlocalpeer.cpp trunk/src/qtsingleapplication/qtlocalpeer.cpp
    1159 --- vendor\current/src/qtsingleapplication/qtlocalpeer.cpp      2012-03-05 14:25:32.000000000 +0100
    1160 +++ trunk/src/qtsingleapplication/qtlocalpeer.cpp       2013-05-23 18:23:28.000000000 +0200
    1161 @@ -48,7 +48,7 @@
    1162  typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
    1163  static PProcessIdToSessionId pProcessIdToSessionId = 0;
    1164  #endif
    1165 -#if defined(Q_OS_UNIX)
    1166 +#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
    1167  #include <time.h>
    1168  #include <unistd.h>
    1169  #endif
    1170 diff -Naur -x .svn vendor\current/src/smtube_os2.rc trunk/src/smtube_os2.rc
    1171 --- vendor\current/src/smtube_os2.rc    1970-01-01 01:00:00.000000000 +0100
    1172 +++ trunk/src/smtube_os2.rc     2013-05-23 19:46:54.000000000 +0200
     1174diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/src/smtube_os2.rc E:\trees\smtube\trunk/src/smtube_os2.rc
     1175--- E:\trees\smtube\trunk\..\vendor\current/src/smtube_os2.rc   1970-01-01 01:00:00.000000000 +0100
     1176+++ E:\trees\smtube\trunk/src/smtube_os2.rc     2013-05-23 19:46:54.000000000 +0200
    11731177@@ -0,0 +1 @@
    11741178+ICON   1    DISCARDABLE     "..\os2\smtube.ico"
    1175 diff -Naur -x .svn vendor\current/src/smtube.pro trunk/src/smtube.pro
    1176 --- vendor\current/src/smtube.pro       2013-05-03 23:03:38.000000000 +0200
    1177 +++ trunk/src/smtube.pro        2013-05-23 19:47:44.000000000 +0200
    1178 @@ -91,3 +91,7 @@
     1179diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/src/smtube.pro E:\trees\smtube\trunk/src/smtube.pro
     1180--- E:\trees\smtube\trunk\..\vendor\current/src/smtube.pro      2013-05-03 23:03:38.000000000 +0200
     1181+++ E:\trees\smtube\trunk/src/smtube.pro        2013-11-28 11:55:12.000000000 +0100
     1182@@ -91,3 +91,11 @@
    11791183 win32 {
    11801184     RC_FILE = smtube.rc
    … …  
    11831187+os2 {
    11841188+    RC_FILE = smtube_os2.rc
     1189+    # define the vendor part
     1190+    DEF_FILE_VENDOR = bww bitwise works GmbH
     1191+    DEF_FILE_VERSION = $$APPLICATION_VERSION
     1192+    DEF_FILE_DESCRIPTION = eCS (OS/2) port of SMTube
    11851193+}
Note: See TracChangeset for help on using the changeset viewer.