-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge #18: Shrink diff against upstream Tor as much as possible
0993230 Bring rbm.conf closer to upstream (JeremyRand) 8b8029d Bring Makefile closer to upstream (JeremyRand) 9596bba Add tools/clean-old symlink (JeremyRand) 385ff12 Bring .gitignore closer to upstream (JeremyRand) d6add12 Add symlink from rbm to tor-browser-build/rbm (JeremyRand) 838080b Remove our rbm submodule (JeremyRand) fdf931e Pull latest tor-browser-build (JeremyRand) 3da6339 Pull latest rbm (JeremyRand) Pull request description: This PR eliminates most of the diff between ncdns-repro and upstream tor-browser-build. It wasn't feasible to properly audit most of the diff, and upstream has substantially better QA resources than we do. If any parts of the diff were actually required for ncdns, I suggest either submitting them as follow-up PR's here (with comments explaining why they're needed), or else submitting them upstream to Tor. I can confirm that `make release-linux-x86_64` produces a working binary (modulo cgo issues that I'll file separately) with this PR applied. I haven't tried any of the other targets.
- Loading branch information
Showing
7 changed files
with
306 additions
and
26 deletions.
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 |
---|---|---|
@@ -1,3 +1,12 @@ | ||
out/ | ||
tmp/ | ||
*.swp | ||
/git_clones | ||
/hg_clones | ||
/gclient | ||
/out | ||
/release | ||
/alpha | ||
/alpha_nightly | ||
/nightly | ||
/testbuild | ||
/rbm.local.conf | ||
/logs | ||
/tmp |
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 |
---|---|---|
@@ -1,6 +1,3 @@ | ||
[submodule "rbm"] | ||
path = rbm | ||
url = https://git.torproject.org/builders/rbm.git | ||
[submodule "tor-browser-build"] | ||
path = tor-browser-build | ||
url = https://git.torproject.org/builders/tor-browser-build.git |
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 |
---|---|---|
@@ -1,12 +1,41 @@ | ||
RBM=./rbm/rbm | ||
rbm=./rbm/rbm | ||
|
||
all: release | ||
|
||
release: | ||
$(RBM) build ncdns --target ncdns-linux-x86_64 | ||
release: submodule-update | ||
$(rbm) build ncdns --target release --target ncdns-all | ||
|
||
release-android-armv7: submodule-update | ||
$(rbm) build ncdns --target release --target ncdns-android-armv7 | ||
|
||
release-android-x86: submodule-update | ||
$(rbm) build ncdns --target release --target ncdns-android-x86 | ||
|
||
release-linux-x86_64: submodule-update | ||
$(rbm) build ncdns --target release --target ncdns-linux-x86_64 | ||
|
||
release-linux-i686: submodule-update | ||
$(rbm) build ncdns --target release --target ncdns-linux-i686 | ||
|
||
release-windows-i686: submodule-update | ||
$(rbm) build ncdns --target release --target ncdns-windows-i686 | ||
|
||
release-windows-x86_64: submodule-update | ||
$(rbm) build ncdns --target release --target ncdns-windows-x86_64 | ||
|
||
release-osx-x86_64: submodule-update | ||
$(rbm) build ncdns --target release --target ncdns-osx-x86_64 | ||
|
||
submodule-update: | ||
git submodule update --init | ||
$(MAKE) -C tor-browser-build submodule-update | ||
|
||
fetch: submodule-update | ||
$(RBM) fetch | ||
$(rbm) fetch | ||
|
||
clean: submodule-update | ||
./tools/clean-old | ||
|
||
clean-dry-run: submodule-update | ||
./tools/clean-old --dry-run | ||
|
Submodule rbm
deleted from
eb500f
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 |
---|---|---|
@@ -0,0 +1 @@ | ||
tor-browser-build/rbm |
Oops, something went wrong.