Remove use of non-portable egrep in scripts

This commit is contained in:
baldurk committed 2016-08-26 13:44:10 +02:00
1 parent 74bd568724
commit e3a11dc453
4 files changed
+11 -11

No files matched your search

+1 -1
View File
@@ -72,7 +72,7 @@ if [[ $AUTOBUILD -eq 0 ]]; then
read;
fi
VERSION=`egrep "#define RENDERDOC_VERSION_(MAJOR|MINOR)" renderdoc/data/version.h | tr -dc '[0-9\n]' | tr '\n' '.' | egrep -o '[0-9]+\.[0-9]+'`
VERSION=`grep -E "#define RENDERDOC_VERSION_(MAJOR|MINOR)" renderdoc/data/version.h | tr -dc '[0-9\n]' | tr '\n' '.' | grep -Eo '[0-9]+\.[0-9]+'`
export RENDERDOC_VERSION="${VERSION}.0"
+6 -6
View File
@@ -1871,12 +1871,12 @@ string ToStrHelper<false, RDCGLenum>::Get(const RDCGLenum &el)
{
#undef GLenum
// egrep -ih '#define[ \t]*[A-Z_0-9]*[ \t]*0x[0-9A-F]{4,}\s*$' glcorearb.h glext.h wglext.h
// glxext.h
// | awk '{print $2" "$3}' | grep -v '_BIT[_ ]' | sed -e '{s# 0x0*# #g}' | awk -F"[. ]"
//'!a[$2]++'
// | sed -e '{s%\(.*\) \(.*\)%\t\tTOSTR_CASE_STRINGIZE_GLENUM(\1)%g}' | grep -v _BIT | awk '
//! x[$0]++'
// in official/
// grep -Eih '#define[ \t]*[A-Z_0-9]*[ \t]*0x[0-9A-F]{4,}\s*$' *.h
// | awk '{print $2" "$3}' | grep -v '_BIT[_ ]'
// | sed -e '{s# 0x0*# #g}' | awk -F"[. ]" '!a[$2]++'
// | sed -e '{s%\(.*\) \(.*\)%\t\tTOSTR_CASE_STRINGIZE_GLENUM(\1)%g}'
// | grep -v _BIT | awk '!x[$0]++'
RDCCOMPILE_ASSERT(sizeof(RDCGLenum) == sizeof(uint32_t),
"Enum isn't 32bits - serialising is a problem!");
+3 -3
View File
@@ -25,9 +25,9 @@
#pragma once
// egrep -ih '#define[ \t]*[A-Z_0-9]*[ \t]*0x[0-9A-F]{4,}\s*$' glcorearb.h glext.h wglext.h
// glxext.h
// | awk '{print $2" "$3}' | sed -e '{s%\(.*\) \(.*\)%\te\1 = \2,%g}' | awk ' !x[$0]++'
// in official/
// grep -Eih '#define[ \t]*[A-Z_0-9]*[ \t]*0x[0-9A-F]{4,}\s*$' *.h
// | awk '{print $2" "$3}' | sed -e '{s%\(.*\) \(.*\)%\te\1 = \2,%g}' | awk ' !x[$0]++'
enum RDCGLenum
{
+1 -1
View File
@@ -95,7 +95,7 @@ my @dllexportfuncs = ();
my @glextfuncs = ();
my @processed = ();
my $typedefs = `egrep -h PFN[0-9A-Z_-]+PROC official/glcorearb.h official/glext.h`;
my $typedefs = `grep -Eh PFN[0-9A-Z_-]+PROC official/glcorearb.h official/glext.h`;
foreach my $typedef (split(/\n/, $typedefs))
{
if($typedef =~ /^typedef (.*)\([A-Z *]* (.*)\) \((.*)\);/)