Skip to content

Commit

Permalink
Move most of the source code into a new src/ folder, to prevent top-l…
Browse files Browse the repository at this point in the history
…evel directory clutter
  • Loading branch information
Whiteknight committed Apr 18, 2012
1 parent 26bd9e1 commit 0e8b302
Show file tree
Hide file tree
Showing 19 changed files with 41 additions and 45 deletions.
24 changes: 12 additions & 12 deletions .gitignore
Original file line number Original file line Diff line number Diff line change
@@ -1,14 +1,14 @@
dynext/* dynext/*
parrotstore/* parrotstore/*
mongodb/pmc/*.c src/mongodb/pmc/*.c
mongodb/pmc/*.o src/mongodb/pmc/*.o
mongodb/pmc/*.dump src/mongodb/pmc/*.dump
mongodb/pmc/*.h src/mongodb/pmc/*.h
mysql/pmc/*.c src/mysql/pmc/*.c
mysql/pmc/*.o src/mysql/pmc/*.o
mysql/pmc/*.dump src/mysql/pmc/*.dump
mysql/pmc/*.h src/mysql/pmc/*.h
sqlite3/pmc/*.c src/sqlite3/pmc/*.c
sqlite3/pmc/*.o src/sqlite3/pmc/*.o
sqlite3/pmc/*.h src/sqlite3/pmc/*.h
sqlite3/pmc/*.dump src/sqlite3/pmc/*.dump
34 changes: 15 additions & 19 deletions Makefile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,48 +9,44 @@ install: install_memcached install_mysql install_mongodb install_sqlite
memcached: parrotstore/memcached.pbc memcached: parrotstore/memcached.pbc


clean_memcached: clean_memcached:
winxed setup.winxed memcached clean winxed src/setup.winxed memcached clean


install_memcached: install_memcached:
winxed setup.winxed memcached install winxed src/setup.winxed memcached install


parrotstore/memcached.pbc: memcached/ parrotstore/memcached.pbc:
winxed setup.winxed memcached build winxed src/setup.winxed memcached build


## MongoDB ## MongoDB


mongodb: mongodb:
winxed setup.winxed mongodb build winxed src/setup.winxed mongodb build


clean_mongodb: clean_mongodb:
winxed setup.winxed mongodb clean winxed src/setup.winxed mongodb clean


install_mongodb: install_mongodb:
winxed setup.winxed mongodb install winxed src/setup.winxed mongodb install


## MySQL ## MySQL


mysql: dynext/mysql_group.so mysql:

winxed src/setup.winxed mysql build
dynext/mysql_group.so: mysql/pmc/mysqldbcontext.pmc mysql/pmc/mysqldatatable.pmc mysql/pmc/mysqldatarow.pmc mysql/include/ps_mysql.h
winxed setup.winxed mysql build


clean_mysql: clean_mysql:
winxed setup.winxed mysql clean winxed src/setup.winxed mysql clean


install_mysql: install_mysql:
winxed setup.winxed mysql install winxed src/setup.winxed mysql install


## SQLite ## SQLite


sqlite3: dynext/sqlite3_group.so sqlite3:

winxed src/setup.winxed sqlite3 build
dynext/sqlite3_group.so: sqlite3/pmc/sqlite3dbcontext.pmc sqlite3/pmc/sqlite3datatable.pmc sqlite3/pmc/sqlite3datarow.pmc sqlite3/include/ps_sqlite3.h
winxed setup.winxed sqlite3 build


clean_sqlite3: clean_sqlite3:
winxed setup.winxed sqlite3 clean winxed src/setup.winxed sqlite3 clean


install_sqlite3: install_sqlite3:
winxed setup.winxed sqlite3 install winxed src/setup.winxed sqlite3 install


File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
28 changes: 14 additions & 14 deletions setup.winxed → src/setup.winxed
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ $include "Rosella/Winxed.winxed";
function setup_memcached(var parrotstore, var argv) function setup_memcached(var parrotstore, var argv)
{ {
parrotstore["winxed_winxed"]["parrotstore/memcached.winxed"] = [ parrotstore["winxed_winxed"]["parrotstore/memcached.winxed"] = [
"memcached/Includes.winxed", "src/memcached/Includes.winxed",
"memcached/Memcached.winxed", "src/memcached/Memcached.winxed",
"memcached/ServerList.winxed" "src/memcached/ServerList.winxed"
]; ];
parrotstore["pir_winxed"]["parrotstore/memcached.pir"] = "parrotstore/memcached.winxed"; parrotstore["pir_winxed"]["parrotstore/memcached.pir"] = "parrotstore/memcached.winxed";
parrotstore["pbc_pir"]["parrotstore/memcached.pbc"] = "parrotstore/memcached.pir"; parrotstore["pbc_pir"]["parrotstore/memcached.pbc"] = "parrotstore/memcached.pir";
Expand All @@ -15,22 +15,22 @@ function setup_memcached(var parrotstore, var argv)


function setup_mysql(var parrotstore, var argv) function setup_mysql(var parrotstore, var argv)
{ {
parrotstore["dynpmc_cflags"] = "-g -I./mysql/include"; parrotstore["dynpmc_cflags"] = "-g -I./src/mysql/include";
parrotstore["dynpmc_ldflags"] = "-lmysqlclient"; parrotstore["dynpmc_ldflags"] = "-lmysqlclient";
parrotstore["dynpmc"]["mysql_group"] = [ parrotstore["dynpmc"]["mysql_group"] = [
"mysql/pmc/mysqldbcontext.pmc", "src/mysql/pmc/mysqldbcontext.pmc",
"mysql/pmc/mysqldatatable.pmc", "src/mysql/pmc/mysqldatatable.pmc",
"mysql/pmc/mysqldatarow.pmc" "src/mysql/pmc/mysqldatarow.pmc"
]; ];
} }


function setup_mongodb(var parrotstore, var argv) function setup_mongodb(var parrotstore, var argv)
{ {
parrotstore["dynpmc_cflags"] = "-g -I./mongodb/include"; parrotstore["dynpmc_cflags"] = "-g -I./src/mongodb/include";
parrotstore["dynpmc_ldflags"] = "-lbson -lmongoc"; parrotstore["dynpmc_ldflags"] = "-lbson -lmongoc";
parrotstore["dynpmc"]["mongodb_group"] = [ parrotstore["dynpmc"]["mongodb_group"] = [
"mongodb/pmc/mongodbcontext.pmc", "src/mongodb/pmc/mongodbcontext.pmc",
"mongodb/pmc/bsondocument.pmc" "src/mongodb/pmc/bsondocument.pmc"
]; ];
//parrotstore["winxed_winxed"]["parrotstore/mongodb.winxed"] = [ //parrotstore["winxed_winxed"]["parrotstore/mongodb.winxed"] = [
// "mongodb/Includes.winxed", // "mongodb/Includes.winxed",
Expand All @@ -43,12 +43,12 @@ function setup_mongodb(var parrotstore, var argv)


function setup_sqlite(var parrotstore, var argv) function setup_sqlite(var parrotstore, var argv)
{ {
parrotstore["dynpmc_cflags"] = "-g -I./sqlite3/include"; parrotstore["dynpmc_cflags"] = "-g -I./src/sqlite3/include";
parrotstore["dynpmc_ldflags"] = "-lsqlite3"; parrotstore["dynpmc_ldflags"] = "-lsqlite3";
parrotstore["dynpmc"]["sqlite3_group"] = [ parrotstore["dynpmc"]["sqlite3_group"] = [
"sqlite3/pmc/sqlite3dbcontext.pmc", "src/sqlite3/pmc/sqlite3dbcontext.pmc",
"sqlite3/pmc/sqlite3datatable.pmc", "src/sqlite3/pmc/sqlite3datatable.pmc",
"sqlite3/pmc/sqlite3datarow.pmc" "src/sqlite3/pmc/sqlite3datarow.pmc"
]; ];
} }


Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 0e8b302

Please sign in to comment.