Commit e0fe4d74 authored by aroben@apple.com's avatar aroben@apple.com

Move JavaScriptCoreGenerated's file-copying logic out to a new script

Hopefully this will make it easier to modify this logic in the future. I also made the
script much quieter than the old logic, since it didn't seem helpful to see long lists of
filenames during the copying phase.

If we like this new style, we could copy it for our other projects.

Fixes <http://webkit.org/b/57950> JavaScriptCoreGenerated's file-copying logic is hard to
modify and noisy

Reviewed by Steve Falkenburg.

* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make: Moved logic to copy
files from here...
* JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd: ...to here. (Added.)

* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj: Added copy-files.cmd
for convenience.

git-svn-id: svn://svn.chromium.org/blink/trunk@83056 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 4efbe80e
2011-04-06 Adam Roben <aroben@apple.com>
Move JavaScriptCoreGenerated's file-copying logic out to a new script
Hopefully this will make it easier to modify this logic in the future. I also made the
script much quieter than the old logic, since it didn't seem helpful to see long lists of
filenames during the copying phase.
If we like this new style, we could copy it for our other projects.
Fixes <http://webkit.org/b/57950> JavaScriptCoreGenerated's file-copying logic is hard to
modify and noisy
Reviewed by Steve Falkenburg.
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make: Moved logic to copy
files from here...
* JavaScriptCore.vcproj/JavaScriptCore/copy-files.cmd: ...to here. (Added.)
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj: Added copy-files.cmd
for convenience.
2011-04-05 Geoffrey Garen <ggaren@apple.com> 2011-04-05 Geoffrey Garen <ggaren@apple.com>
Try to fix the Windows build. Try to fix the Windows build.
......
...@@ -4,59 +4,12 @@ all: ...@@ -4,59 +4,12 @@ all:
!IF "$(OFFICIAL_BUILD)"!="1" !IF "$(OFFICIAL_BUILD)"!="1"
bash -c "python react-to-vsprops-changes.py" bash -c "python react-to-vsprops-changes.py"
!ENDIF !ENDIF
-mkdir 2>NUL "%ConfigurationBuildDir%\include\JavaScriptCore" copy-files.cmd
xcopy /y /d "..\..\API\APICast.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\APIShims.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JavaScript.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSBase.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSContextRef.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSContextRefPrivate.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSObjectRef.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSObjectRefPrivate.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSStringRef.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSStringRefCF.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSStringRefBSTR.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSValueRef.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JavaScriptCore.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSRetainPtr.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSWeakObjectMapRefInternal.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSWeakObjectMapRefPrivate.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\JSRetainPtr.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\OpaqueJSString.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
xcopy /y /d "..\..\API\WebKitAvailability.h" "%ConfigurationBuildDir%\include\JavaScriptCore"
-mkdir 2>NUL "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\wtf\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\wtf\text\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\wtf\unicode\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\wtf\unicode\icu\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\parser\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\runtime\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\bytecode\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\interpreter\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\assembler\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\jit\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\collector\handles\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\debugger\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\profiler\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\create_hash_table" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\wtf\text\AtomicString.cpp" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\wtf\text\StringBuilder.cpp" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\wtf\text\StringImpl.cpp" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\wtf\text\WTFString.cpp" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
xcopy /y /d "..\..\yarr\*.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore"
-mkdir 2>NUL "%ConfigurationBuildDir%\bin\JavaScriptCore.resources"
xcopy /y /d "..\JavaScriptCore.resources\*" "%ConfigurationBuildDir%\bin\JavaScriptCore.resources"
-del "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdbool.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdint.h" -del "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdbool.h" "%ConfigurationBuildDir%\include\private\JavaScriptCore\stdint.h"
-del "%ConfigurationBuildDir%\buildfailed" -del "%ConfigurationBuildDir%\buildfailed"
clean: clean:
-del "%ConfigurationBuildDir%\buildfailed" -del "%ConfigurationBuildDir%\buildfailed"
-del /s /q "%ConfigurationBuildDir%\include\JavaScriptCore\JavaScriptCore" copy-files.cmd clean
-del /s /q "%ConfigurationBuildDir%\obj\JavaScriptCore\DerivedSources" -del /s /q "%ConfigurationBuildDir%\obj\JavaScriptCore\DerivedSources"
-del /s /q "%ConfigurationBuildDir%\include\private\JavaScriptCore"
-del /s /q "%ConfigurationBuildDir%\bin\JavaScriptCore.resources"
...@@ -86,6 +86,10 @@ ...@@ -86,6 +86,10 @@
RelativePath=".\build-generated-files.sh" RelativePath=".\build-generated-files.sh"
> >
</File> </File>
<File
RelativePath=".\copy-files.cmd"
>
</File>
<File <File
RelativePath="..\..\DerivedSources.make" RelativePath="..\..\DerivedSources.make"
> >
......
@echo off
set PublicHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\JavaScriptCore
set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\JavaScriptCore
set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin\JavaScriptCore.resources
if "%1" EQU "clean" goto :clean
if "%1" EQU "rebuild" call :clean
echo Copying public headers...
mkdir "%PublicHeadersDirectory%" 2>NUL
for %%f in (
APICast.h
APIShims.h
JSBase.h
JSContextRef.h
JSContextRefPrivate.h
JSObjectRef.h
JSObjectRefPrivate.h
JSRetainPtr.h
JSRetainPtr.h
JSStringRef.h
JSStringRefBSTR.h
JSStringRefCF.h
JSValueRef.h
JSWeakObjectMapRefInternal.h
JSWeakObjectMapRefPrivate.h
JavaScript.h
JavaScriptCore.h
OpaqueJSString.h
WebKitAvailability.h
) do (
xcopy /y /d ..\..\API\%%f "%PublicHeadersDirectory%" >NUL
)
echo Copying private headers...
mkdir "%PrivateHeadersDirectory%" 2>NUL
for %%d in (
assembler
bytecode
collector\handles
debugger
interpreter
jit
parser
profiler
runtime
wtf
wtf\text
wtf\unicode
wtf\unicode\icu
yarr
) do (
xcopy /y /d ..\..\%%d\*.h "%PrivateHeadersDirectory%" >NUL
)
echo Copying resources...
mkdir "%ResourcesDirectory%" 2>NUL
xcopy /y /d ..\JavaScriptCore.resources\* "%ResourcesDirectory%" >NUL
echo Copying other files...
for %%f in (
create_hash_table
wtf\text\AtomicString.cpp
wtf\text\StringBuilder.cpp
wtf\text\StringImpl.cpp
wtf\text\WTFString.cpp
) do (
xcopy /y /d ..\..\%%f "%PrivateHeadersDirectory%" >NUL
)
goto :EOF
:clean
echo Deleting copied files...
del /s /q "%PublicHeadersDirectory%" >NUL
del /s /q "%PrivateHeadersDirectory%" >NUL
del /s /q "%ResourcesDirectory%" >NUL
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment