Attachment 868537 Details for Bug 1070738 – Get rid of BatchSubstitute.bat and use sed instead

[patch] Get rid of BatchSubstitute.bat and use sed instead

0001-Get-rid-of-BatchSubstitute.bat.patch (text/plain), 2.35 KB, created by Uri Lublin on 2014-02-27 13:36:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uri Lublin

Created: 2014-02-27 13:36:51 UTC

Size: 2.35 KB

patch

obsolete

>From d87a59e6c2fd95e427297fd5525649f86f28f9b0 Mon Sep 17 00:00:00 2001
>Message-Id: <d87a59e6c2fd95e427297fd5525649f86f28f9b0.1393508074.git.uril@redhat.com>
>From: Christophe Fergeau <cfergeau@redhat.com>
>Date: Thu, 12 Sep 2013 12:11:21 +0200
>Subject: [spicex-win 1/2] Get rid of BatchSubstitute.bat
>
>This file is non-free, and it's doing the same thing as sed,
>so we can use that instead.
>---
> BatchSubstitute.bat |   20 --------------------
> PreBuild.bat        |    6 +++---
> SpiceX.vcproj       |    4 ----
> 3 files changed, 3 insertions(+), 27 deletions(-)
> delete mode 100644 BatchSubstitute.bat
>
>diff --git a/BatchSubstitute.bat b/BatchSubstitute.bat
>deleted file mode 100644
>index 443f96d..0000000
>--- a/BatchSubstitute.bat
>+++ /dev/null
>@@ -1,20 +0,0 @@
>-@echo off
>-REM -- Prepare the Command Processor --
>-SETLOCAL ENABLEEXTENSIONS
>-SETLOCAL DISABLEDELAYEDEXPANSION
>-
>-::BatchSubstitude - parses a File line by line and replaces a substring"
>-::syntax: BatchSubstitude.bat OldStr NewStr File
>-::          OldStr [in] - string to be replaced
>-::          NewStr [in] - string to replace with
>-::          File   [in] - file to be parsed
>-:$changed 20100115
>-:$source http://www.dostips.com
>-if "%~1"=="" findstr "^::" "%~f0"&GOTO:EOF
>-for /f "tokens=1,* delims=]" %%A in ('"type %3|find /n /v """') do (
>-    set "line=%%B"
>-    if defined line (
>-        call set "line=echo.%%line:%~1=%~2%%"
>-        for /f "delims=" %%X in ('"echo."%%line%%""') do %%~X
>-    ) ELSE echo.
>-)
>diff --git a/PreBuild.bat b/PreBuild.bat
>index 54ac971..a8150e7 100644
>--- a/PreBuild.bat
>+++ b/PreBuild.bat
>@@ -26,6 +26,6 @@ echo Wrong ConfigurationName %2
> exit /B 1
> )
> 
>-call BatchSubstitute.bat LIBCELT %CELT% SpiceX.inf.template > SpiceX.inf.tmp
>-call BatchSubstitute.bat CLASS_ID %CLSID% SpiceX.inf.tmp > SpiceX.inf
>-call BatchSubstitute.bat CLASS_ID %CLSID% OSpiceX.rgs.template > OSpiceX.rgs
>+sed "s|LIBCELT|%CELT%|" SpiceX.inf.template > SpiceX.inf.tmp
>+sed "s|CLASS_ID|%CLSID%|" SpiceX.inf.tmp > SpiceX.inf
>+sed "s|CLASS_ID|%CLSID%|" OSpiceX.rgs.template > OSpiceX.rgs
>diff --git a/SpiceX.vcproj b/SpiceX.vcproj
>index 66584e4..fd6a5ca 100644
>--- a/SpiceX.vcproj
>+++ b/SpiceX.vcproj
>@@ -598,10 +598,6 @@
> 			Name="Build"
> 			>
> 			<File
>-				RelativePath=".\BatchSubstitute.bat"
>-				>
>-			</File>
>-			<File
> 				RelativePath=".\Sign.bat"
> 				>
> 			</File>
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 1070738: 868537 | 868539