X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=scripts%2Fupdate_cpve.pl;fp=scripts%2Fupdate_cpve.pl;h=6f5555582d25232965b8adffd6fc56f768a57a06;hb=ead4f202d58421c31b50ef662d1ee5429543599c;hp=ab2360a01990a969edd48c3ee743334bbdb44f69;hpb=05b182e7dbdc09f1fab436559fb25086c54c66b8;p=dotfiles.git

diff --git a/scripts/update_cpve.pl b/scripts/update_cpve.pl
index ab2360a..6f55555 100755
--- a/scripts/update_cpve.pl
+++ b/scripts/update_cpve.pl
@@ -10,40 +10,43 @@ print "-n $options{n}\n" if defined $options{n};
 
 my $ip = (split / /, `ifconfig | grep "inet .*broadcast"`)[1];
 
+my $cpve_dir = '/Users/peli3/CPVE/cpve_trunk/';
+my $ecc_dir = '/Users/peli3/JCC/ecc-p2p/';
+
+
+#### 
 if($options{n})
 {
     print "==== don't build CPVE ======\n";
 }
 else 
 {    
-    print "building cpve\n";
-    chdir '/Users/peli3/CPVE/cpve_trunk' or die ": $!";
+    ## building CPVE
+    chdir $cpve_dir or die ": $!";
     !system "scons arch=x86_64 platform=darwin debug=True -j16 osxversion=10.10"    or die "building CPVE failed : $!";
 
-    chdir '/Users/peli3/JCC/ecc-p2p' or die ": $!";
-    print "remove cpve libs\n";
-    !system "rm -rf ./contrib/cpve/lib/darwin/x86_64/*"     or die "remove libs failed : $!";
+    ## remove old cpve libs and replace in ECC
+    !system "rm -rf $ecc_dir/contrib/cpve/lib/darwin/x86_64/*"     or die "remove libs failed : $!";
 
-    print "copy cpve libs\n";
-    !system "/bin/cp -r /Users/peli3/CPVE/cpve_trunk/target/dist/lib/darwin/x86_64/* ./contrib/cpve/lib/darwin/x86_64/"     or die "copy libs failed: $!";
+    !system "/bin/cp -r $cpve_dir/target/dist/lib/darwin/x86_64/* $ecc_dir/contrib/cpve/lib/darwin/x86_64/"     or die "copy libs failed: $!";
 
 }
 
-print "building ecc\n";
+#### building ecc
+chdir $ecc_dir or die ": $!";
 !system "python runSconsBuild.py JabberMac64Bit  -j 16  -t no --early_cpve"     or die " building ECC failed : $!";
 
 print "copy bin-s bin-c\n";
-###system "rm -rf bin-s binn-c";
-!system "/bin/cp -r out/bin ./bin-c" or die "$!";
-!system "/bin/cp -r out/bin ./bin-s" or die "$!";
+!system "rm -rf bin-s/* bin-c/*" or die "$!";
+!system "/bin/cp -r $ecc_dir/out/bin/* $ecc_dir/bin-c" or die "$!";
+!system "/bin/cp -r $ecc_dir/out/bin/* $ecc_dir/bin-s" or die "$!";
 
 print "copy config files\n";
-!system "/bin/cp ./sss.txt  ./bin-s/cucm-credentials.txt" or die ": $!";
-!system "/bin/cp ./ccc.txt  ./bin-c/cucm-credentials.txt" or die ": $!";
+!system "/bin/cp $ecc_dir/sss.txt  $ecc_dir/bin-s/cucm-credentials.txt" or die ": $!";
+!system "/bin/cp $ecc_dir/ccc.txt  $ecc_dir/bin-c/cucm-credentials.txt" or die ": $!";
 
 print "add p2p server ip\n";
-open CONF, ">>", './bin-c/cucm-credentials.txt' or  die "error $!";
-#print CONF "P2P_SERVER_IP=" . &get_local_ip . "\n";
+open CONF, ">>", "$ecc_dir/bin-c/cucm-credentials.txt" or  die "error $!";
 print CONF "P2P_SERVER_IP=" . $ip . "\n";
 close CONF;
 
@@ -56,3 +59,4 @@ print "####### DONE #######\n";
 ##    return @cc[1];
 #}
 
+#print CONF "P2P_SERVER_IP=" . &get_local_ip . "\n";