Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

remove build scripts for HTTPS Everywhere #9653

Merged
merged 2 commits into from
Jul 1, 2017
Merged

remove build scripts for HTTPS Everywhere #9653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
643996d
remove HTTPS Everywhere build scripts
diracdeltas Jun 21, 2017
70bfd75
Cleaning up leveldown references
bsclifton Jun 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions app/ledger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1862,35 +1862,6 @@ var run = (delayTime) => {
console.log('what? wait, how can this happen?')
}

/*
* ledger client utilities
*/

/* code that may never be needed...

var rulesV2Reset = (callback) => {
if (clientOptions.verboseP) console.log('\n\nreset rulesets')
if (!v2RulesetDB) return

if (client) {
delete client.state.rulesV2Stamp
client.state.updatesStamp = underscore.now()
}
v2RulesetDB.close((err) => {
if (err) console.log(v2RulesetPath + ' close error: ' + err.toString())

v2RulesetDB = null
require('leveldown').destroy(pathName(v2RulesetPath), (err) => {
if (err) console.log(v2RulesetPath + ' destroy error: ' + err.toString())

v2RulesetDB = levelup(pathName(v2RulesetPath))
callback()
})
})
}

*/

var getStateInfo = (state) => {
var ballots, i, transaction
var info = state.paymentInfo
Expand Down
4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"flow": "flow; test $? -eq 0 -o $? -eq 2",
"lint": "standard",
"postinstall": "npm run download-sync-client && webpack",
"preload-httpse": "node ./preload-httpse.js",
"start-log": "node ./tools/start.js --user-data-dir=brave-development --enable-logging=stderr --v=1 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck",
"start": "node ./tools/start.js --user-data-dir=brave-development --enable-logging --v=0 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck",
"start2": "node ./tools/start.js --user-data-dir=brave-development-2 --enable-logging --v=0 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck",
Expand Down Expand Up @@ -166,8 +165,7 @@
"jsonfile": "^2.2.3",
"less": "^2.5.3",
"less-loader": "^2.2.1",
"level": "1.5.0",
"leveldown": "1.5.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'll need some more code removed, since leveldown is being removed... I'll have a follow up commit in just a minute

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bsclifton leveldown is included in level btw

"level": "^1.7.0",
"mkdirp": "^0.5.1",
"mocha": "^2.3.4",
"mockery": "^1.7.0",
Expand Down
155 changes: 0 additions & 155 deletions preload-httpse.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/unit/app/browser/reducers/tabsReducerTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ describe('tabsReducer unit tests', function () {
})
mockery.registerMock('electron', fakeElectron)
mockery.registerMock('ad-block', fakeAdBlock)
mockery.registerMock('leveldown', {})

this.tabsAPI = {
isDevToolsFocused: (tabId) => {
Expand Down
1 change: 0 additions & 1 deletion test/unit/app/browser/tabsTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ describe('tabs API unit tests', function () {

mockery.registerMock('electron', fakeElectron)
mockery.registerMock('ad-block', fakeAdBlock)
mockery.registerMock('leveldown', {})
mockery.registerMock('../../js/stores/appStore', this.appStore)
mockery.registerMock('../filtering', {
isResourceEnabled: (resourceName, url, isPrivate) => false
Expand Down
9 changes: 0 additions & 9 deletions tools/electronBuilderHack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@ const rebuildCmd = '"../.bin/node-gyp" rebuild'
const isDarwin = process.platform === 'darwin'

const cmds = []
if (process.env.TARGET_ARCH === 'ia32') {
cmds.push(
'cp .npmrc ./node_modules/leveldown',
'cd ./node_modules/leveldown',
// leveldown prebuild isn't respecting the npm_config_arch env
// for some reason, so always compile it.
'npm run rebuild'
)
}

if (isDarwin) {
cmds.push(
Expand Down
1 change: 0 additions & 1 deletion tools/lib/ignoredPaths.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module.exports = [
'Release/obj',
'obj.target',
'ad-block/(node_modules|test|perf|sample|scripts|test|vendor|ABPFilterParserData.dat)',
'leveldown/(node_modules|src|iojs)',
'tracking-protection/(node_modules|test|data|scripts|vendor)',
'tracking-protection/build/node_modules',
'tracking-protection/build/Release/(sample.exe|test.exe)',
Expand Down