updated build fpc rpm script

git-svn-id: trunk@4387 -
This commit is contained in:
mattias 2003-07-08 20:09:40 +00:00
parent 7880351d77
commit fdc345358e
2 changed files with 43 additions and 19 deletions

View File

@ -8186,48 +8186,65 @@ var
//---------- //----------
function NoDrawableToNoDrawable: Boolean; function NoDrawableToNoDrawable: Boolean;
const // FROM TO {const // FROM TO
BLT_MATRIX: array[TGDIBitmapType, TGDIBitmapType] of TBltFunction = ( BLT_MATRIX: array[TGDIBitmapType, TGDIBitmapType] of TBltFunction = (
(@DrawableToDrawable, @BitmapToPixmap, @BitmapToImage), (@DrawableToDrawable, @BitmapToPixmap, @BitmapToImage),
(@PixmapToBitmap, @DrawableToDrawable, @PixmapToImage), (@PixmapToBitmap, @DrawableToDrawable, @PixmapToImage),
(@ImageToBitmap, @ImageToDrawable, @ImageToImage) (@ImageToBitmap, @ImageToDrawable, @ImageToImage)
); );}
begin begin
If (TDeviceContext(SrcDC).CurrentBitmap <> nil) and If (TDeviceContext(SrcDC).CurrentBitmap <> nil) and
(TDeviceContext(DestDC).CurrentBitmap <> nil) (TDeviceContext(DestDC).CurrentBitmap <> nil)
then then
Result := BLT_MATRIX[ case TDeviceContext(SrcDC).CurrentBitmap^.GDIBitmapType of
TDeviceContext(SrcDC).CurrentBitmap^.GDIBitmapType, gbBitmap: case TDeviceContext(DestDC).CurrentBitmap^.GDIBitmapType of
TDeviceContext(DestDC).CurrentBitmap^.GDIBitmapType gbBitmap: Result:=DrawableToDrawable;
]() gbPixmap: Result:=BitmapToPixmap;
gbImage: Result:=BitmapToImage;
end;
gbPixmap: case TDeviceContext(DestDC).CurrentBitmap^.GDIBitmapType of
gbBitmap: Result:=PixmapToBitmap;
gbPixmap: Result:=DrawableToDrawable;
gbImage: Result:=PixmapToImage;
end;
gbImage: case TDeviceContext(DestDC).CurrentBitmap^.GDIBitmapType of
gbBitmap: Result:=ImageToBitmap;
gbPixmap: Result:=ImageToDrawable;
gbImage: Result:=ImageToImage;
end;
end
else else
Result := Unsupported; Result := Unsupported;
end; end;
function NoDrawableToDrawable: Boolean; function NoDrawableToDrawable: Boolean;
const {const
BLT_FUNCTION: array[TGDIBitmapType] of TBltFunction = ( BLT_FUNCTION: array[TGDIBitmapType] of TBltFunction = (
@PixmapToDrawable, @PixmapToDrawable, @ImageToDrawable @PixmapToDrawable, @PixmapToDrawable, @ImageToDrawable
); );}
begin begin
If TDeviceContext(SrcDC).CurrentBitmap <> nil then If TDeviceContext(SrcDC).CurrentBitmap <> nil then
Result := BLT_FUNCTION[ case TDeviceContext(SrcDC).CurrentBitmap^.GDIBitmapType of
TDeviceContext(SrcDC).CurrentBitmap^.GDIBitmapType gbBitmap: Result:=PixmapToDrawable;
]() gbPixmap: Result:=PixmapToDrawable;
gbImage: Result:=ImageToDrawable;
end
else else
Result := Unsupported; Result := Unsupported;
end; end;
function DrawableToNoDrawable: Boolean; function DrawableToNoDrawable: Boolean;
const {const
BLT_FUNCTION: array[TGDIBitmapType] of TBltFunction = ( BLT_FUNCTION: array[TGDIBitmapType] of TBltFunction = (
@Unsupported, @Unsupported, @Unsupported @Unsupported, @Unsupported, @Unsupported
); );}
begin begin
If TDeviceContext(DestDC).CurrentBitmap <> nil then If TDeviceContext(DestDC).CurrentBitmap <> nil then
Result := BLT_FUNCTION[ case TDeviceContext(DestDC).CurrentBitmap^.GDIBitmapType of
TDeviceContext(DestDC).CurrentBitmap^.GDIBitmapType gbBitmap: Result:=Unsupported;
]() gbPixmap: Result:=Unsupported;
gbImage: Result:=Unsupported;
end
else else
Result := Unsupported; Result := Unsupported;
end; end;
@ -8589,6 +8606,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.262 2003/07/08 20:09:40 mattias
updated build fpc rpm script
Revision 1.261 2003/07/07 07:59:34 mattias Revision 1.261 2003/07/07 07:59:34 mattias
made Size_SourceIsInterface a flag made Size_SourceIsInterface a flag

View File

@ -54,7 +54,10 @@ VersionFile="$TmpDir/compiler/version.pas"
CompilerVersion=`cat $VersionFile | grep ' *version_nr *=.*;' | sed -e 's/[^0-9]//g'` CompilerVersion=`cat $VersionFile | grep ' *version_nr *=.*;' | sed -e 's/[^0-9]//g'`
CompilerRelease=`cat $VersionFile | grep ' *release_nr *=.*;' | sed -e 's/[^0-9]//g'` CompilerRelease=`cat $VersionFile | grep ' *release_nr *=.*;' | sed -e 's/[^0-9]//g'`
CompilerPatch=`cat $VersionFile | grep ' *patch_nr *=.*;' | sed -e 's/[^0-9]//g'` CompilerPatch=`cat $VersionFile | grep ' *patch_nr *=.*;' | sed -e 's/[^0-9]//g'`
LazVersion="$CompilerVersion.$CompilerRelease.$CompilerPatch" LazVersion="$CompilerVersion.$CompilerRelease"
if [ "$CompilerPatch" != "0" ]; then
LazVersion="$LazVersion.$CompilerPatch"
fi
SpecFile=$TmpDir/install/fpc.spec SpecFile=$TmpDir/install/fpc.spec
@ -80,11 +83,12 @@ fi
# change Makefile for new rpmbuild, if not already done # change Makefile for new rpmbuild, if not already done
cd $TmpDir cd $TmpDir
grep rpmbuild Makefile \ if [ -n `grep rpmbuild Makefile` ]; then
|| cat Makefile | \ cat Makefile | \
sed -e 's/rpm\( --nodeps -ba .*\)$/rpm\1 || rpmbuild\1/g' \ sed -e 's/rpm\( --nodeps -ba .*\)$/rpm\1 || rpmbuild\1/g' \
> New.Makefile > New.Makefile
mv New.Makefile Makefile mv New.Makefile Makefile
fi
cd - cd -
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------