|
|
| (66 intermediate revisions by the same user not shown) |
| Line 1: |
Line 1: |
| − | {{Warn|text=This guide is currently being rewritten to reflect the new workflow. Some things may be unclear, some things may no longer be relevant, some things may be missing. Please be patient.}}
| + | #REDIRECT [[Newbie_Guide:_Getting_Started_on_Windows]] |
| − | | + | |
| − | {{Note|text=Feel free to correct, expand, do anything which could make this better and clearer. ^_^}}
| + | |
| − | | + | |
| − | | + | |
| − | = What do you need and why? =
| + | |
| − | | + | |
| − | Because you're on Windows, you have to use quite a number of tools to access and manage things so this part might seem a little daunting. The good news is that 1) you're used to being flexible and resourceful, right? 2) once you've got everything set up things will be much simpler.
| + | |
| − | | + | |
| − | So what do you need?
| + | |
| − | | + | |
| − | # You need a Dreamhack where you'll clone the Dreamwidth code. Think of it as an online mirror of the Dreamwidth site. | + | |
| − | # You need a Github account to be able to clone the Dreamwith repository code into your Dreamhack and fetch updates. This is your code source.
| + | |
| − | # You need PuTTY to connect GitHub to your Dreamhack, and to access and manage it. PuTTY is your center of command. You can't do anything without it.
| + | |
| − | # You need WinSCP to visualize the files on your Dreamhack and be able to open them in a text editor.
| + | |
| − | # You need a text editor to edit your files.
| + | |
| − | # You need a Bugzilla account to find bugs, files bugs and upload patches.
| + | |
| − | | + | |
| − | | + | |
| − | == Get a Dreamhack ==
| + | |
| − | | + | |
| − | * Apply for a Dreamhack by [http://hack.dreamwidth.net/apply.shtml filling this form]. The two important fields are 'your desired username' and 'your email address'. Your username is used to manage your Dreamhack and to create the URL where your Dreamhack will be located at so you can pick anything. Your email address is used to send you a welcome e-mail which contains important information as well as various alerts. You can pick any of your existing email addresses or choose to create an email account entirely devoted to your development work.
| + | |
| − | | + | |
| − | * Once you're done, you should get an e-mail with your login username and a password. Don't lose it.
| + | |
| − | | + | |
| − | | + | |
| − | == Create an account on GitHub ==
| + | |
| − | | + | |
| − | * Go to [http://www.github.com/ GitHub], click on 'sign up and pricing' and create a free account. I suggest you pick a username people are familiar with and the same username you'll have on your Bugzilla account.
| + | |
| − | | + | |
| − | | + | |
| − | == Install PuTTY ==
| + | |
| − | | + | |
| − | * Download 'Windows installer for everything except PuTTYtel' .exe file at [http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html PuTTY] and install it.
| + | |
| − | | + | |
| − | * Run PuTTY. In the configuration window, enter "hack.dreamwidth.net" for the host name. Go to Connection/Data and enter the username/login given to you in the welcome e-mail. It should be something like dh-username.
| + | |
| − | | + | |
| − | * Click on Open. If you get a pop-up message about a key, click Yes.
| + | |
| − | | + | |
| − | * Enter the password given to you in the welcome e-mail when asked. Note that no characters are displayed and the cursor won't move. It's normal.
| + | |
| − | | + | |
| − | * Change your password by typing:
| + | |
| − | <syntaxhighlight lang="bash">passwd</syntaxhighlight>
| + | |
| − | | + | |
| − | * Your default Dreamhack account is called system. Type this to set its password:
| + | |
| − | | + | |
| − | <source lang="bash">$LJHOME/bin/upgrading/make_system.pl</source>
| + | |
| − | | + | |
| − | | + | |
| − | == Install WinSCP ==
| + | |
| − | | + | |
| − | * Install [http://winscp.net/eng/download.php WinSCP]. During the installation, you may be asked about the mode you prefer: Commander and Explorer. Commander works like an FTP client: a partitioned window with your computer files on one side and the Dreamhack files on the other. Explorer will only display your Dreamhack files and works like Windows's Explorer. I prefer this mode because I rarely need to access my computer files but choose what's easiest for you.
| + | |
| − | | + | |
| − | * Use "hack.dreamwidth.net" for the host name. Enter your username and your new password. Click on Save then on Login.
| + | |
| − | | + | |
| − | | + | |
| − | == Get a good text editor ==
| + | |
| − | | + | |
| − | While you can use Notepad, I recommend [[Editor:_Notepad_plus_plus | Notepad++]] instead. It's free, simple and will make editing much easier.
| + | |
| − | | + | |
| − | | + | |
| − | == Create a Bugzilla account ==
| + | |
| − | | + | |
| − | * Simply [http://bugs.dwscoalition.org/createaccount.cgi click here].
| + | |
| − | | + | |
| − | * As <dwuser>mark</dwuser> explained [http://dw-dev.dreamwidth.org/17146.html here], go to [http://bugs.dwscoalition.org/userprefs.cgi?tab=account Name and Password] and enter your name following this format: <code>Name [:username]</code>. 'Name' can be your real name, a nickname, your username again, etc. You don't have to give your real name if you don't want to.
| + | |
| − | | + | |
| − | | + | |
| − | = Setting things up =
| + | |
| − | | + | |
| − | == On your GitHub account ==
| + | |
| − | | + | |
| − | You need to fork the Dreamwidth code onto your own account. Forking is like cloning and branching. It will copy the code and also label your copy as being a branch (a fork) of the original Dreamwidth code.
| + | |
| − | | + | |
| − | * Go to https://github.com/dreamwidth/dw-free and click on Fork on the upper right corner.
| + | |
| − | | + | |
| − | * Then go to https://github.com/dreamwidth/dw-nonfree and do the same.
| + | |
| − | | + | |
| − | | + | |
| − | == On your Dreamhack ==
| + | |
| − | | + | |
| − | Now you need to 'import' both of these onto your Dreamhack and link them to the original Dreamwidth repositories on GitHub so you can easily fetch updates.
| + | |
| − | | + | |
| − | To do so, [[Moving_your_Dreamwidth_installation_to_use_Github#Stop_the_server_and_all_workers | follow all the steps from this point on until you start your server again]] (but skip the 'non-dreamhack users' section, of course).
| + | |
| − | | + | |
| − | | + | |
| − | == Further steps on your Dreamhack ==
| + | |
| − | | + | |
| − | These are not mandatory but will make your life easier.
| + | |
| − | | + | |
| − | == Change some git settings ==
| + | |
| − | | + | |
| − | I suggest going through [Git_settings#Recommended_settings|all the steps mentioned in this section].
| + | |
| − | | + | |
| − | | + | |
| − | {{Note|text=If anybody knows how to make your default Windows editor git's default editor, please say so. I've read multiple articles on this topic and nothing worked for me.}}
| + | |
| − | | + | |
| − | | + | |
| − | === Give special abilities to your system account ===
| + | |
| − | | + | |
| − | * Log in to your Dreamhack (http://www.yourusername.hack.dreamwidth.net/) using system and your password.
| + | |
| − | | + | |
| − | * Go to [http://www.yourusername.hack.dreamwidth.net/admin/priv/ http://www.yourusername.hack.dreamwidth.net/admin/priv/]. Click on 'payments' type 'system' in the User field then click on 'Make Changes'. The system account now has the ability (called 'privilege' or 'priv') to give paid time to any account.
| + | |
| − | | + | |
| − | * Go to [http://www.yourusername.hack.dreamwidth.net/admin/pay http://www.yourusername.hack.dreamwidth.net/admin/pay]. Type 'system' in the Edit user field and click on Go. Make your account a seed one.
| + | |
| − | | + | |
| − | | + | |
| − | === Get rid of invite codes ===
| + | |
| − | | + | |
| − | * In WinSCP, go to <code>/dw/ext/local/etc/</code>, and double-click on <code>config.pl</code>. Find <code>$USE_ACCT_CODES = 1;</code> and change 1 to <code>0</code>. Save your file.
| + | |
| − | | + | |
| − | * In PuTTY, type this to make the changes go live on your Dreamhack:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">$LJHOME/bin/upgrading/update-db.pl -r -p --innodb
| + | |
| − | $LJHOME/bin/upgrading/update-db.pl -r --cluster=all --innodb
| + | |
| − | $LJHOME/bin/upgrading/texttool.pl load</syntaxhighlight>
| + | |
| − | | + | |
| − | | + | |
| − | = Making sure things are up-to-date =
| + | |
| − | | + | |
| − | == Updating your code ==
| + | |
| − | | + | |
| − | * Code is committed by developers all the time. You must regularly update your repositories with the <code>pull</code> command:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">cd $LJHOME
| + | |
| − | git pull dreamwidth develop:develop
| + | |
| − | git pull dreamwidth master:master</syntaxhighlight>
| + | |
| − | | + | |
| − | * To push the changes to your GitHub account you need to add this:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">git push origin develop
| + | |
| − | git push origin master</syntaxhighlight>
| + | |
| − | | + | |
| − | * For the nonfree part of the code, the commands are exactly the same except the one to go to the correct directory:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">cd $LJHOME/ext/dw-nonfree</syntaxhighlight>
| + | |
| − | | + | |
| − | * You can also create a script to make it simpler. See [[Dev_Maintenance#dwu_-_Updating_the_repos | this article]].
| + | |
| − | | + | |
| − | : N.B. to create a new file on WinSCP, right click into the correct folder (<code>/bin</code> here) then click on New/File.
| + | |
| − | | + | |
| − | | + | |
| − | == Updating your database ==
| + | |
| − | | + | |
| − | * We're already seen this once but here it is again:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">$LJHOME/bin/upgrading/update-db.pl -r -p --innodb
| + | |
| − | $LJHOME/bin/upgrading/update-db.pl -r --cluster=all --innodb
| + | |
| − | $LJHOME/bin/upgrading/texttool.pl load</syntaxhighlight>
| + | |
| − | | + | |
| − | * You can also create a script to make it simpler. See [[Dev_Maintenance#dwdb_-_Updating_the_database | this article]].
| + | |
| − | | + | |
| − | | + | |
| − | = Making changes to the code =
| + | |
| − | | + | |
| − | == Find or file a bug ==
| + | |
| − | | + | |
| − | * To find: you can use [http://bugs.dwscoalition.org/userprefs.cgi?tab=saved-searches predefined searches] such as [http://bugs.dwscoalition.org/buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=unassigned%20effort-minor&sharer_id=2 unassigned effort-minor].
| + | |
| − | | + | |
| − | : Some of these bugs won't appear to require 'minor' effort to you. It's normal. Try to find small bugs among them: minor modifications to be done on one of the site pages (text to be modified; elements to be added, removed or moved; elements to be hidden from some categories of users, etc.).
| + | |
| − | | + | |
| − | * To file: make sure it's not already been filed using [http://bugs.dwscoalition.org/query.cgi?format=specific simple search] or [http://bugs.dwscoalition.org/query.cgi?format=advanced advanced search] then [http://bugs.dwscoalition.org/enter_bug.cgi?product=Dreamwidth%20Development use this form] to file a new bug. Fill and edit the fields as needed.
| + | |
| − | | + | |
| − | * To assign a bug to yourself, enter your Bugzilla e-mail address in Assign To and set the status to IN_PROGRESS.
| + | |
| − | | + | |
| − | : To make this easier, you can also use of <dwuser>fu</dwuser>'s Greasemonkey scripts: [http://www.afunamatata.com/greasemonkey/ Dreamwidth Bug Grabber]. Click on (grab!) next to Assign To and this will edit it and Status for you. Click on Save Changes of course.
| + | |
| − | | + | |
| − | | + | |
| − | == Create a branch ==
| + | |
| − | | + | |
| − | * You're going to create a new branch on your own copy of the Dreamwidth repository specifically dedicated to the bug you want to work on. Use the bug number and a short description in the name, like so:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">git branch bug###/xxx</syntaxhighlight>
| + | |
| − | | + | |
| − | * To switch to this branch, use the <code>checkout</code> command and the name of your branch:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">git checkout bug###/xxx</syntaxhighlight>
| + | |
| − | | + | |
| − | * And that's it. Now you can start coding!
| + | |
| − | | + | |
| − | | + | |
| − | == Edit files ==
| + | |
| − | | + | |
| − | * Use WinSCP to open the file(s) you need to edit.
| + | |
| − | | + | |
| − | * Remember that the free part of the code is in <code>~/dw/*</code> while the non-free part is in <code>~/dw/ext/dw-nonfree/*</code>.
| + | |
| − | | + | |
| − | * If you're working on site pages, you're working on .bml files. These are in <code>~dw/htdocs/</code> or one of the subsequent folders. You'll see that their names correspond to the URLs of site pages. These files may use .pm modules/widgets which are in <code>~dw/cgi-bin/DW/</code> or <code>~dw/LJ/</code>.
| + | |
| − | | + | |
| − | * For text strings which are not in <code>~dw/htdocs/xxx.bml.text</code> files, see <code>~dw/bin/upgrading/en.dat</code>.
| + | |
| − | | + | |
| − | * For more specific searches, you can use the grep command: <code>grep [option(s)] pattern [file(s)]</code>
| + | |
| − | | + | |
| − | Interesting options:
| + | |
| − | | + | |
| − | -E: match using extended regular expressions
| + | |
| − | -F: match using fixed strings
| + | |
| − | -r: recursive
| + | |
| − | -i: case insensitive
| + | |
| − | -l: filename only
| + | |
| − | -n: add relative line number
| + | |
| − | | + | |
| − | Examples:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">grep -ri "find this text" * | more</syntaxhighlight>
| + | |
| − | | + | |
| − | : This will search for "find this text" in all files.
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">grep -ri "find this text" * | more</syntaxhighlight>
| + | |
| − | | + | |
| − | : This will search for "find this text" in all files but only display the relevant filenames and not any excerpts.
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">grep -rl print_entry $LJHOME/bin/upgrading/s2layers</syntaxhighlight>
| + | |
| − | | + | |
| − | : This will search for files containing "print_entry" in the /s2layers folder, and only display the filenames are results.
| + | |
| − | | + | |
| − | | + | |
| − | = Test Your Changes on Your Dreamhack =
| + | |
| − | | + | |
| − | * In PuTTY, stop your Dreamhack:
| + | |
| − | <syntaxhighlight lang="bash">stop-apache</syntaxhighlight>
| + | |
| − | | + | |
| − | * Update your databas using this or the <code>dwdb</code> you created:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">$LJHOME/bin/upgrading/update-db.pl -r -p --innodb
| + | |
| − | $LJHOME/bin/upgrading/update-db.pl -r --cluster=all --innodb
| + | |
| − | $LJHOME/bin/upgrading/texttool.pl load</syntaxhighlight>
| + | |
| − | | + | |
| − | * Start your Dreamhack again:
| + | |
| − | <syntaxhighlight lang="bash">start-apache</syntaxhighlight>
| + | |
| − | | + | |
| − | * Go to your Dreamhack and test. Edit the files again in WinSCP if more changes are needed. Go through these steps again to test your new changes.
| + | |
| − | | + | |
| − | | + | |
| − | = Request your changes to be pulled into Dreamwidth =
| + | |
| − | | + | |
| − | == Commit your changes ==
| + | |
| − | | + | |
| − | * Use the <code>commit</code> command:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">git commit</syntaxhighlight>
| + | |
| − | | + | |
| − | * This will also open the nano editor so that you can type a commit message. Mention the bug number again and explain (quite briefly) what your changes do.
| + | |
| − | | + | |
| − | | + | |
| − | == Push the changes to your GitHub fork ==
| + | |
| − | | + | |
| − | * Use the <code>push</code> command and the branch name to push your changes to GitHub:
| + | |
| − | | + | |
| − | <syntaxhighlight lang="bash">git push origin bug###/xxx</syntaxhighlight>
| + | |
| − | | + | |
| − | | + | |
| − | == Request your changes to be pulled into the main code ==
| + | |
| − | | + | |
| − | * On your GitHub page, click on the correct repository (dw-free or dw-nonfree), select the correct branch in the branch drop-down menu (this is below 'Clone in Windows') then click on Pull Request (it's at the top).
| + | |
| − | | + | |
| − | | + | |
| − | == Note the pull request on Bugzilla ==
| + | |
| − | | + | |
| − | * On your hard drive, create a simple text file indicating your patch is on GitHub (use a generic file).
| + | |
| − | | + | |
| − | * Log in to [http://bugs.dwscoalition.org/ Bugzilla] and open your bug.
| + | |
| − | | + | |
| − | * Click on 'Add an Attachment' to attach your text file. Add a link to your pull request in the description, check and set Flags/Commit and Flags/Review to ?. Feel free to add questions or remarks. Click on Submit.
| + | |
| − | | + | |
| − | * Wait for someone to review and commit your patch. You're done. :)
| + | |
| − | | + | |
| − | * (optional) [[Patches|Further reading on patches]]
| + | |
| − | | + | |
| − | | + | |
| − | = More: stashing your changes =
| + | |
| − | | + | |
| − | FIXME
| + | |
| − | | + | |
| − | | + | |
| − | = More: deleting a branch =
| + | |
| − | | + | |
| − | FIXME
| + | |
| − | | + | |
| − | | + | |
| − | = More: troubleshooting tips =
| + | |
| − | | + | |
| − | == Issues with text strings ==
| + | |
| − | | + | |
| − | * As <dwuser>denise</dwuser> explained [http://dw-dev-training.dreamwidth.org/13233.html here], you need to delete old text strings and create new ones when you edit .text files or en.dat instead of simply editing the text. If the change isn't critical - the string doesn't need to be renamed or the text change is minor - it's better to notify the site copy team so that text can be changed locally and the original file left alone.
| + | |
| − | | + | |
| − | * If text you've modified doesn't appear on the site after a code push, append <code>?uselang=debug</code> to the page URL to make sure it's using the right string. If it is and it still doesn't display after a while, comment on <dwcomm>dw_maintenance</dwcomm>.
| + | |
| − | | + | |
| − | == Starting over ==
| + | |
| − | | + | |
| − | * If something's really wrong you can also [[Dreamhack_Troubleshooting#I_want_to_wipe_my_install_and_start_over|rebuild you Dreamhack and start over]].
| + | |
| − | | + | |
| − | * Delete your copies of the Dreamwidth repositories:
| + | |
| − | | + | |
| − | FIXME
| + | |
| − | | + | |
| − | | + | |
| − | = References =
| + | |
| − | | + | |
| − | * [Moving_your_Dreamwidth_installation_to_use_Github|Moving to GitHub]
| + | |
| − | * [Dev_Maintenance|Development Maintenance]
| + | |
| − | * [Draft:_Github_development_process|Github Development Process]
| + | |
| − | * [http://ss64.com/bash/ Bash commands]
| + | |
| − | * [Git_Getting_Started|Git: Getting Started]
| + | |
| − | * [http://learn.github.com/p/intro.html Learn.GitHub]
| + | |
| − | | + | |
| − | [[Category:Development]]
| + | |
| − | [[Category:Getting Started]] | + | |
