This repository has been archived by the owner on Jan 13, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1k
FIXED MakeSwig.bat creates output + copy directories if needed #93
Open
kdavison
wants to merge
1
commit into
facebookarchive:master
Choose a base branch
from
kdavison:fix_makeswig_bat
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,19 @@ if "%swigPath%"=="" goto :SKIPADDSLASH | |
if "%swigPath:~-1%"=="\" goto :SKIPADDSLASH | ||
SET swigPath=%swigPath%\ | ||
:SKIPADDSLASH | ||
del /F /Q SwigOutput\SwigCSharpOutput\* | ||
|
||
set swigOutputCsharp=SwigOutput\SwigCSharpOutput | ||
set swigOutputCplusDLL=SwigOutput\CplusDLLIncludes | ||
set swigInterface=SwigInterfaceFiles | ||
set swigFiles=SwigWindowsCSharpSample\SwigTestApp\SwigFiles | ||
|
||
if not exist %swigOutputCsharp% ( mkdir %swigOutputCsharp% ) | ||
if not exist %swigOutputCplusDLL% ( mkdir %swigOutputCplusDLL% ) | ||
if not exist %swigInterface% ( mkdir %swigInterface% ) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The SwigInterfaceFiles directory should exist prior to running the MakeSwig batch file since it should contain the required interface files. Hence, creating this directory here should not really serve any purpose or am I overlooking anything? |
||
if not exist %swigFiles% ( mkdir %swigFiles% ) | ||
|
||
del /F /Q %swigOutputCsharp%\* | ||
|
||
if "%3"=="" goto :NOSQL | ||
%swigPath%swig -c++ -csharp -namespace RakNet -I"%1" -I"SwigInterfaceFiles" -I"%3" -DSWIG_ADDITIONAL_SQL_LITE -outdir SwigOutput\SwigCSharpOutput -o SwigOutput\CplusDLLIncludes\RakNet_wrap.cxx SwigInterfaceFiles\RakNet.i | ||
copy /Y SwigOutput\SwigCSharpOutput\* SwigWindowsCSharpSample\SwigTestApp\SwigFiles\* | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that while you are introducing the variables here, the folder names are still hard coded throughout the batch file (f.e. in line 23).
Also corresponding changes should/could be applied to MakeSwigWithExtras.bat as well (not required in SLikeNet since there we combined the two batch files in a single one).