Imaginez que vous travaillez sur une branche develop, qui donc contient les toutes dernières modifications, et une autre branche demo.
Disons que cette dernière est en retard d’un an.
Si vous essayez de faire un bête merge
|
1 2 |
git checkout demo
git merge develop |
Vous risquez d’entrer en guerre avec toute une série de conflits.
Maybe, some of you are using the GNOME Applet Natural Scrolling?
If not, and you want to know what is Natural Scrolling, then look at the README file.
You maybe know too that I’m the collaborator cemmanouilidis.
Then I’m implemented the next major feature: Multiple devices support.
Short answer is close to the end.
I already have release a first testing version. To do that, I’ve created a naturalscrolling-testing package available in my Apple naturalscrolling PPA.
There already exists an issue on github.com about missing dependencies. So sorry about that.
If you’ve tested it, and have a bug, please fill in a new issue following instructions from the Natural Scrolling Wiki page
Since the announcement of the project until my last post about Douane, I didn’t post any visual things.
That’s the goal of this article 
One feature of Douane will be to show, in real time, the network activities.
To show this activities, I’ve been inspired by Little Snitch, and I did 2 gauges to show in and out going traffic.
(I miss Little Snitch on Ubuntu, so that’s why I’m so inspired by it. But I will not do a clone only. I want more features.)
As I’m a Ubuntu fan, I made it in order to be well integrated to Unity, but also to GNOME-Shell.
In my previous article, I was speaking about stabilization of my Kernel module.
This is now quite done. The kernel module is working well (no more crashing of the Virtual Machine). I just have to keep in mind to check for memory leaks.
Well now, the next step is the Daemon!
So I’m back to my C++ courses. I’d forgot a lot, but knowledge is coming back again. 
Erf… no. No graphical stuff to show you.
Some days ago I’ve announced my brand new project Douane.
Daemon and Linux Kernel module communication is now fixed and work pretty well, but my development environment (a VirtualBox instance hosting Ubuntu Precise 12.04) is crashing after few minutes.
So I’m now working on the stabilization of the kernel module.
Still not. Like in my previous post, sorry.
Douane is an Interactive Firewall for Linux >= 2.6. like TuxGuardian.
It means that when an application try to open a new connection to a remote server, and is unknown by Douane, then a dialog box allowing you to decide if you accept it or not will popup, blocking the application until you answer it.
Basically it’s another interface to Linux Netfilter, but more friendly user.
The project will be splited in some pieces, and the very first one is a Linux Kernel module (written in C), and a daemon (written in C++).
I’m currently working on the Kernel module communications with User namespace application on my Ubuntu Oneiric 11.10, with a VirtualBox instance hosting Ubuntu Precise 12.04 (Kernel version 3.2.0).
The first release will only show the network activities without blocking anythings (because the kernel need to know all rules in order to block or not requests, and that part will be done after).
No. At least some debugs messages from the kernel, but I don’t think that you want it 
Si vous rencontrez des difficultés à démarrer votre GNU/Linux, je vous conseil vivement Boot-Repair !
Prenez votre CD d’Ubuntu (par exemple), puis installez Boot-Repair (suivre ce lien pour Ubuntu: https://help.ubuntu.com/community/Boot-Repair) puis lancer Boot-Repair.
Cliquez sur le premier bouton et laissez faire !
Et tout fonctionnera !
After 2 years of Ruby On Rails development at my work, I finally created my first gem after having contributed to the DOTIW gem.
We was looking to a gem that do the inverse of the ActionView::Helpers::NumberHelper#number_to_human_size.
As we didn’t find anything, I’ve decided to write it a last week-end and here is the human_size_to_number gem !
Au travail, nous utilisons TextMate. Ce dernier, peut-être lancé depuis le terminal en passant un répertoire comme projet afin de pouvoir atteindre n’importe quel fichier.
Pour se faire, une fois dans le répertoire racine du projet, nous n’avons qu’à lancer ceci:
|
1 |
$ mate . |
TextMate est lancé puis le prompt est rendu.
Avec Gedit, c’est un peu différent. Si je fais:
|
1 |
$ gedit . |
Gedit se lance bien avec comme répertoire courant le chemin où je me trouve, mais par-contre, Gedit n’est pas détaché du terminal. Si bien que si je ferme le terminal ou fais CTRL + C, Gedit se ferme.
Pour imiter TextMate, j’ai imaginé une toute petite fonction bash (que j’utilise avec zsh) que voici:
|
1 2 3 |
gedit () {
/usr/bin/gedit "$1" &
} |
Cette fonction surcharge gedit afin de prendre la chemin passé, de l’envoyer à Gedit puis le & permet de détacher Gedit de l’instance du terminal.
Voilà
Je viens d’avoir ce petit soucis au boulot, et comme j’ai la solution, je la partage !
Une fois passé à OS X Lion, et Java installé par le Software update, j’ai donc lancé l’installation des gems d’un project Ruby On Rails ayant comme dépendance rjb.
Mais pendant son installation, voici l’erreur que j’avais:
|
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 |
Installing rjb (1.2.6) with native extensions /Users/zedtux/.rvm/rubies/ree-1.8.7-2011.03/lib/ruby/site_ruby/1.8/rubygems/installer.rb:533:in <code>build_extensions': ERROR: Failed to build gem native extension. (Gem::Installer::ExtensionBuildError)
/Users/zedtux/.rvm/rubies/ree-1.8.7-2011.03/bin/ruby extconf.rb
*** extconf.rb failed ***
Could not create Makefile due to some reason, probably lack of
necessary libraries and/or headers. Check the mkmf.log file for more
details. You may need configuration options.
Provided configuration options:
--with-opt-dir
--without-opt-dir
--with-opt-include
--without-opt-include=${opt-dir}/include
--with-opt-lib
--without-opt-lib=${opt-dir}/lib
--with-make-prog
--without-make-prog
--srcdir=.
--curdir
--ruby=/Users/zedtux/.rvm/rubies/ree-1.8.7-2011.03/bin/ruby
extconf.rb:40:in </code>open': No such file or directory - /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/Home/include (Errno::ENOENT)
from extconf.rb:40
Gem files will remain installed in /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/rjb-1.2.6 for inspection.
Results logged to /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/rjb-1.2.6/ext/gem_make.out
from /Users/zedtux/.rvm/rubies/ree-1.8.7-2011.03/lib/ruby/site_ruby/1.8/rubygems/installer.rb:486:in <code>each'
from /Users/zedtux/.rvm/rubies/ree-1.8.7-2011.03/lib/ruby/site_ruby/1.8/rubygems/installer.rb:486:in </code>build_extensions'
from /Users/zedtux/.rvm/rubies/ree-1.8.7-2011.03/lib/ruby/site_ruby/1.8/rubygems/installer.rb:159:in <code>install'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/source.rb:101:in </code>install'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/rubygems_integration.rb:78:in <code>preserve_paths'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/source.rb:91:in </code>install'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/installer.rb:58:in <code>run'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/rubygems_integration.rb:93:in </code>with_build_args'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/installer.rb:57:in <code>run'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/spec_set.rb:12:in </code>each'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/spec_set.rb:12:in <code>each'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/installer.rb:49:in </code>run'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/installer.rb:8:in <code>install'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/cli.rb:222:in </code>install'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/vendor/thor/task.rb:22:in <code>send'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/vendor/thor/task.rb:22:in </code>run'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/vendor/thor/invocation.rb:118:in <code>invoke_task'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/vendor/thor.rb:246:in </code>dispatch'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/lib/bundler/vendor/thor/base.rb:389:in <code>start'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/gems/bundler-1.0.15/bin/bundle:13
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/bin/bundle:19:in </code>load'
from /Users/zedtux/.rvm/gems/ree-1.8.7-2011.03/bin/bundle:19 |
Mon JAVA_HOME étant définie comme ceci:
|
1 |
export JAVA_HOME=$(/usr/libexec/java_home) |
et donc contenant:
|
1 2 |
echo $JAVA_HOME
/Library/Java/JavaVirtualMachines/1.6.0_26-b03-383.jdk/Contents/Home |
Pour corriger ce problème, il suffit de créer un lien symbolique manquant qui ajoutera le dossier include dans le JAVA_HOME comme ceci:
|
1 |
sudo ln -s /System/Library/Frameworks/JavaVM.framework/Headers $JAVA_HOME/include |
Maintenant l’installation de RJB re-fonctionne !
![[Valid RSS]](wp-content/uploads/2009/10/valid-rss.png "Validate my RSS feed")
© 2012 ZedTuX On R00t · Fièrement propulsé par WordPress & Green Park 2 par Cordobo.
XHTML 1.0 Transitional valide | CSS 3 valide
