Changeset 1111 for s10k


Ignore:
Timestamp:
Feb 16, 2019, 6:25:06 PM (6 years ago)
Author:
s10k
Message:

Added version 2.0e (bugfix in patch file for paths with apostrophes)

Location:
s10k/XmlTools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • s10k/XmlTools/README.txt

    r1073 r1111  
    11Readme.txt
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    3 XmlTools v2.0d
     3XmlTools v2.0e
    44~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    55
     
    5050----------------------------------
    5151
    52 Script10k, "faob2@hotmail.com"
     52s10k, "faob2@hotmail.com"
    5353
    5454Oni Central Forum:
     
    6161----------------------------------
    6262Change Log:
     63----------------------------------
     642.0e, 16-02-2019
     65-Fixed bug in the processing of patch files when the target XML contained an apostrophe (') in the path
    6366----------------------------------
    64672.0d, 05-10-2017
  • s10k/XmlTools/utilglobalvars.h

    r1073 r1111  
    2424
    2525static const QString AppName = "XmlTools";
    26 static const QString AppVersion = "2.0d";
     26static const QString AppVersion = "2.0e";
    2727#ifdef Q_OS_WIN
    2828static const QString AppExecutable=AppName+".exe";
  • s10k/XmlTools/xmlpatch.cpp

    r1073 r1111  
    374374            command=GlobalVars::AppExecutable;
    375375
    376             // Append files if forced to
    377             if(!this->forceTargetFilesWildcard.isEmpty()){
    378                 command+=" --files '"+this->forceTargetFilesWildcard+"' ";
    379             }
    380 
    381376            command+=" "+getPatchParameterValue(line,"Options");
    382377
     
    392387            command.replace("'","\""); //replace apostrophe by quotes, to avoid problems
    393388            command.replace("\"\"","'"); // this allow to use '' as ' ('' is transformed in "" and then in ')
     389
     390            // Append files if forced to
     391
     392            // This is added at the end so the apostrophe isn't done here (the path can contain it)
     393            if(!this->forceTargetFilesWildcard.isEmpty()){
     394                command+=" --files \""+this->forceTargetFilesWildcard+"\" ";
     395            }
    394396
    395397            executeCommandOperation(command);
Note: See TracChangeset for help on using the changeset viewer.