Skip to content

Commit 63f534e

Browse files
authored
Merge pull request #2496 from uProxy/trevj-uproxy-obfuscators-refs
remove references to uproxy-obfuscators
2 parents 351129a + 85e717d commit 63f534e

File tree

1 file changed

+11
-40
lines changed

1 file changed

+11
-40
lines changed

Gruntfile.coffee

Lines changed: 11 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -603,28 +603,19 @@ gruntConfig = {
603603
Rule.copyLibs
604604
npmLibNames: ['freedom-for-chrome']
605605
pathsFromDevBuild: ['lib/churn-pipe', 'lib/loggingprovider', 'lib/zork']
606-
pathsFromThirdPartyBuild: [
607-
'uproxy-obfuscators',
608-
'freedom-port-control'
609-
]
606+
pathsFromThirdPartyBuild: ['freedom-port-control']
610607
localDestPath: 'lib/samples/zork-chromeapp/'
611608
libsForZorkFirefoxApp:
612609
Rule.copyLibs
613610
npmLibNames: ['freedom-for-firefox']
614611
pathsFromDevBuild: ['lib/churn-pipe', 'lib/loggingprovider', 'lib/zork']
615-
pathsFromThirdPartyBuild: [
616-
'uproxy-obfuscators',
617-
'freedom-port-control'
618-
]
612+
pathsFromThirdPartyBuild: ['freedom-port-control']
619613
localDestPath: 'lib/samples/zork-firefoxapp/data/'
620614
libsForZorkNode:
621615
Rule.copyLibs
622616
npmLibNames: ['freedom-for-node']
623617
pathsFromDevBuild: ['lib/churn-pipe', 'lib/loggingprovider', 'lib/zork']
624-
pathsFromThirdPartyBuild: [
625-
'uproxy-obfuscators',
626-
'freedom-port-control'
627-
]
618+
pathsFromThirdPartyBuild: ['freedom-port-control']
628619
localDestPath: 'lib/samples/zork-node/'
629620

630621
libsForEchoServerChromeApp:
@@ -642,25 +633,19 @@ gruntConfig = {
642633
Rule.copyLibs
643634
npmLibNames: ['freedom-for-chrome']
644635
pathsFromDevBuild: ['lib/copypaste-chat', 'lib/churn-pipe', 'lib/loggingprovider']
645-
pathsFromThirdPartyBuild: [
646-
'freedom-port-control'
647-
]
636+
pathsFromThirdPartyBuild: ['freedom-port-control']
648637
localDestPath: 'lib/samples/copypaste-chat-chromeapp/'
649638
libsForCopypasteChatFirefoxApp:
650639
Rule.copyLibs
651640
npmLibNames: ['freedom-for-firefox']
652641
pathsFromDevBuild: ['lib/copypaste-chat', 'lib/churn-pipe', 'lib/loggingprovider']
653-
pathsFromThirdPartyBuild: [
654-
'freedom-port-control'
655-
]
642+
pathsFromThirdPartyBuild: ['freedom-port-control']
656643
localDestPath: 'lib/samples/copypaste-chat-firefoxapp/data'
657644
libsForCopypasteChatWebApp:
658645
Rule.copyLibs
659646
npmLibNames: ['freedom']
660647
pathsFromDevBuild: ['lib/copypaste-chat', 'lib/churn-pipe', 'lib/loggingprovider']
661-
pathsFromThirdPartyBuild: [
662-
'freedom-port-control'
663-
]
648+
pathsFromThirdPartyBuild: ['freedom-port-control']
664649
localDestPath: 'lib/samples/copypaste-chat-webapp/'
665650

666651
libsForCopyPasteSocksChromeApp:
@@ -670,7 +655,6 @@ gruntConfig = {
670655
]
671656
pathsFromDevBuild: ['lib/copypaste-socks', 'lib/churn-pipe', 'lib/loggingprovider']
672657
pathsFromThirdPartyBuild: [
673-
'uproxy-obfuscators'
674658
'i18n'
675659
'bower/polymer'
676660
'freedom-pgp-e2e'
@@ -684,7 +668,6 @@ gruntConfig = {
684668
]
685669
pathsFromDevBuild: ['lib/copypaste-socks', 'lib/churn-pipe', 'lib/loggingprovider']
686670
pathsFromThirdPartyBuild: [
687-
'uproxy-obfuscators'
688671
'i18n'
689672
'bower'
690673
'freedom-pgp-e2e'
@@ -696,36 +679,26 @@ gruntConfig = {
696679
Rule.copyLibs
697680
npmLibNames: ['freedom-for-chrome']
698681
pathsFromDevBuild: ['lib/simple-socks', 'lib/churn-pipe', 'lib/loggingprovider']
699-
pathsFromThirdPartyBuild: [
700-
'uproxy-obfuscators'
701-
'freedom-port-control'
702-
]
682+
pathsFromThirdPartyBuild: ['freedom-port-control']
703683
localDestPath: 'lib/samples/simple-socks-chromeapp/'
704684
libsForSimpleSocksFirefoxApp:
705685
Rule.copyLibs
706686
npmLibNames: ['freedom-for-firefox']
707687
pathsFromDevBuild: ['lib/simple-socks', 'lib/churn-pipe', 'lib/loggingprovider']
708-
pathsFromThirdPartyBuild: [
709-
'uproxy-obfuscators'
710-
'freedom-port-control'
711-
]
688+
pathsFromThirdPartyBuild: ['freedom-port-control']
712689
localDestPath: 'lib/samples/simple-socks-firefoxapp/data/'
713690

714691
libsForSimpleChatChromeApp:
715692
Rule.copyLibs
716693
npmLibNames: ['freedom-for-chrome']
717694
pathsFromDevBuild: ['lib/simple-chat', 'lib/churn-pipe', 'lib/loggingprovider']
718-
pathsFromThirdPartyBuild: [
719-
'freedom-port-control'
720-
]
695+
pathsFromThirdPartyBuild: ['freedom-port-control']
721696
localDestPath: 'lib/samples/simple-chat-chromeapp/'
722697
libsForSimpleChatFirefoxApp:
723698
Rule.copyLibs
724699
npmLibNames: ['freedom-for-firefox']
725700
pathsFromDevBuild: ['lib/simple-chat', 'lib/churn-pipe', 'lib/loggingprovider']
726-
pathsFromThirdPartyBuild: [
727-
'freedom-port-control'
728-
]
701+
pathsFromThirdPartyBuild: ['freedom-port-control']
729702
localDestPath: 'lib/samples/simple-chat-firefoxapp/data'
730703
# While neither churn-pipe nor freedom-port-control can be used in a
731704
# regular web page environment, they are included so that obfuscation
@@ -734,9 +707,7 @@ gruntConfig = {
734707
Rule.copyLibs
735708
npmLibNames: ['freedom']
736709
pathsFromDevBuild: ['lib/simple-chat', 'lib/churn-pipe', 'lib/loggingprovider']
737-
pathsFromThirdPartyBuild: [
738-
'freedom-port-control'
739-
]
710+
pathsFromThirdPartyBuild: ['freedom-port-control']
740711
localDestPath: 'lib/samples/simple-chat-webapp/'
741712

742713
libsForUprobeChromeApp:

0 commit comments

Comments
 (0)