Commit 1556654d authored by Calvin Metcalf's avatar Calvin Metcalf
Browse files

rming stuff

parent 266e59f3

#%2Amerge%2A#4784R-e#

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
module.exports = function(grunt) {

	grunt.initConfig({

		pkg: grunt.file.readJSON('package.json'),

		concat:{

			full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js'],

				dest:'./dist/proj4.js'

			},

			noDefs:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				dest:'./dist/proj4-noDefs.js'

			}

		},

		uglify:{

			full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./srcgrunt/defs/*.js'],

				dest:'./dist/proj4.min.js'

			},

			noDefs:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				dest:'./dist/proj4-noDefs.min.js'

			}

		}

	});

	grunt.loadNpmTasks('grunt-contrib-concat');

	grunt.loadNpmTasks('grunt-contrib-uglify');

	grunt.registerTask('full', ['concat:full','uglify:full']);

	grunt.registerTask('noDefs', ['concat:noDefs','uglify:noDefs']);

	grunt.registerTask('default', ['full','noDefs']);

}

Gruntfile.js.BACKUP.3696.js

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
module.exports = function(grunt) {

	grunt.initConfig({

		pkg: grunt.file.readJSON('package.json'),

		concat:{

<<<<<<< HEAD

			full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js'],

				dest:'./dist/proj4.js'

			},

			noDefs:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				dest:'./dist/proj4-noDefs.js'

			}

		},

		uglify:{

			full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./srcgrunt/defs/*.js'],

				dest:'./dist/proj4.min.js'

			},

			noDefs:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				dest:'./dist/proj4-noDefs.min.js'

			}

		}

=======

            full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js'],

                dest:'./dist/proj4.js'

            },

            noDefs:{

                src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

                dest:'./dist/proj4-noDefs.js'

            }

		},

        uglify:{

            full:{

    		    src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./srcgrunt/defs/*.js'],

                dest:'./dist/proj4.min.js'

		    },

            noDefs:{

                src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

                dest:'./dist/proj4-noDefs.min.js'

            }

        }

>>>>>>> update gruntfile

	});

	grunt.loadNpmTasks('grunt-contrib-concat');

	grunt.loadNpmTasks('grunt-contrib-uglify');

	grunt.registerTask('full', ['concat:full','uglify:full']);

	grunt.registerTask('noDefs', ['concat:noDefs','uglify:noDefs']);

	grunt.registerTask('default', ['full','noDefs']);

}

Gruntfile.js.BASE.3696.js

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
module.exports = function(grunt) {

    grunt.initConfig({

		pkg: grunt.file.readJSON('package.json'),

		concat:{

            full:{

				src:[ './src/proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js'],

                dest:'./dist/proj4.js'

            },

            noDefs:{

                src:[ './src/proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

                dest:'./dist/proj4-noDefs.js'

            }

		},

        uglify:{

            full:{

    		    src:[ './src/proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./srcgrunt/defs/*.js'],

                dest:'./dist/proj4.min.js'

		    },

            noDefs:{

                src:[ './src/proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

                dest:'./dist/proj4-noDefs.min.js'

            }

        }

	});

	grunt.loadNpmTasks('grunt-contrib-concat');

    grunt.loadNpmTasks('grunt-contrib-uglify');

    grunt.registerTask('full', ['concat:full','uglify:full']);

    grunt.registerTask('noDefs', ['concat:noDefs','uglify:noDefs']);

	grunt.registerTask('default', ['full','noDefs']);

}

Gruntfile.js.LOCAL.3696.js

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
module.exports = function(grunt) {

	grunt.initConfig({

		pkg: grunt.file.readJSON('package.json'),

		concat:{

			full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js'],

				dest:'./dist/proj4.js'

			},

			noDefs:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				dest:'./dist/proj4-noDefs.js'

			}

		},

		uglify:{

			full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./srcgrunt/defs/*.js'],

				dest:'./dist/proj4.min.js'

			},

			noDefs:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				dest:'./dist/proj4-noDefs.min.js'

			}

		}

	});

	grunt.loadNpmTasks('grunt-contrib-concat');

	grunt.loadNpmTasks('grunt-contrib-uglify');

	grunt.registerTask('full', ['concat:full','uglify:full']);

	grunt.registerTask('noDefs', ['concat:noDefs','uglify:noDefs']);

	grunt.registerTask('default', ['full','noDefs']);

}

Gruntfile.js.REMOTE.3696.js

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
module.exports = function(grunt) {

    grunt.initConfig({

		pkg: grunt.file.readJSON('package.json'),

		concat:{

            full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js'],

                dest:'./dist/proj4.js'

            },

            noDefs:{

                src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

                dest:'./dist/proj4-noDefs.js'

            }

		},

        uglify:{

            full:{

    		    src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./srcgrunt/defs/*.js'],

                dest:'./dist/proj4.min.js'

		    },

            noDefs:{

                src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

                dest:'./dist/proj4-noDefs.min.js'

            }

        }

	});

	grunt.loadNpmTasks('grunt-contrib-concat');

    grunt.loadNpmTasks('grunt-contrib-uglify');

    grunt.registerTask('full', ['concat:full','uglify:full']);

    grunt.registerTask('noDefs', ['concat:noDefs','uglify:noDefs']);

	grunt.registerTask('default', ['full','noDefs']);

}